|
@@ -1,39 +0,0 @@
|
|
|
-From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001
|
|
|
-From: Vincent Rabaud <vrabaud@google.com>
|
|
|
-Date: Sat, 10 Jul 2021 00:21:52 +0200
|
|
|
-Subject: [PATCH] Use the one argument version of SetTotalBytesLimit.
|
|
|
-
|
|
|
-The two argument versions has been deprecated, cf
|
|
|
-https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream
|
|
|
-
|
|
|
-[Retrieved from:
|
|
|
-https://github.com/opencv/opencv/commit/9cfa84313c5833d7295fcf57be93d5d2aaadfd88]
|
|
|
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
----
|
|
|
- modules/dnn/src/caffe/caffe_io.cpp | 5 +++++
|
|
|
- 1 file changed, 5 insertions(+)
|
|
|
-
|
|
|
-diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
|
|
|
-index 2fc4d84f4604..ebecf95eea3a 100644
|
|
|
---- a/modules/dnn/src/caffe/caffe_io.cpp
|
|
|
-+++ b/modules/dnn/src/caffe/caffe_io.cpp
|
|
|
-@@ -92,6 +92,7 @@
|
|
|
- #ifdef HAVE_PROTOBUF
|
|
|
- #include <google/protobuf/io/coded_stream.h>
|
|
|
- #include <google/protobuf/io/zero_copy_stream_impl.h>
|
|
|
-+#include <google/protobuf/stubs/common.h>
|
|
|
- #include <google/protobuf/text_format.h>
|
|
|
-
|
|
|
- #include <opencv2/core.hpp>
|
|
|
-@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by
|
|
|
-
|
|
|
- bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) {
|
|
|
- CodedInputStream coded_input(input);
|
|
|
-+#if GOOGLE_PROTOBUF_VERSION >= 3006000
|
|
|
-+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit);
|
|
|
-+#else
|
|
|
- coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
|
|
|
-+#endif
|
|
|
-
|
|
|
- return proto->ParseFromCodedStream(&coded_input);
|
|
|
- }
|