Merge pull request #14890 from alalek:dnn_consistent_protobuf_readers

2172544b · Alexander Alekhin · df7049d4 · f3e9eb33 · 2172544b
Commit 2172544b authored Jun 26, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

caffe_io.cpp modules/dnn/src/caffe/caffe_io.cpp +6 -1

No files found.
--- a/modules/dnn/src/caffe/caffe_io.cpp
+++ b/modules/dnn/src/caffe/caffe_io.cpp
@@ -1137,7 +1137,12 @@ bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {

 bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) {
    ArrayInputStream input(data, len);
-    return google::protobuf::TextFormat::Parse(&input, proto);
+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
+    return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
+#else
+    return google::protobuf::TextFormat::Parser().Parse(&input, proto);
+#endif
+
 }