aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
Diffstat (limited to 'ports')
-rw-r--r--ports/opencv3/0011-fix-caffe-io.patch11
-rw-r--r--ports/opencv3/portfile.cmake1
-rw-r--r--ports/opencv3/vcpkg.json2
3 files changed, 13 insertions, 1 deletions
diff --git a/ports/opencv3/0011-fix-caffe-io.patch b/ports/opencv3/0011-fix-caffe-io.patch
new file mode 100644
index 000000000..1c0941adb
--- /dev/null
+++ b/ports/opencv3/0011-fix-caffe-io.patch
@@ -0,0 +1,11 @@
+--- 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);
+ }
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index 751f6423e..36d012663 100644
--- a/ports/opencv3/portfile.cmake
+++ b/ports/opencv3/portfile.cmake
@@ -24,6 +24,7 @@ vcpkg_from_github(
0008-devendor-quirc.patch
0009-fix-protobuf.patch
0010-fix-uwp-tiff-imgcodecs.patch
+ 0011-fix-caffe-io.patch
)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
index 6ed1d5032..f750ae57b 100644
--- a/ports/opencv3/vcpkg.json
+++ b/ports/opencv3/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "opencv3",
"version": "3.4.15",
- "port-version": 1,
+ "port-version": 2,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"dependencies": [