mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 04:49:06 +08:00
b29f8ef37e
* [protobuf] upgrade to latest release (v3.18.0) This requires patching OpenCV as it uses a function removed in the latest version of protobuf (FWIW, upstream OpenCV has a similar patch). * The arcus port also needs a patch * The caffe2 port also needs a patch * The brpc port also needs a patch
14 lines
605 B
Diff
14 lines
605 B
Diff
diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
|
|
index 2fc4d84..779d0dd 100644
|
|
--- a/modules/dnn/src/caffe/caffe_io.cpp
|
|
+++ b/modules/dnn/src/caffe/caffe_io.cpp
|
|
@@ -1111,7 +1111,7 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by
|
|
|
|
bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) {
|
|
CodedInputStream coded_input(input);
|
|
- coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
|
|
+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit);
|
|
|
|
return proto->ParseFromCodedStream(&coded_input);
|
|
}
|