From dc3ea70ff53a3989636d98768c1f510cc6baedd8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 3 Nov 2021 21:16:48 -0500 Subject: opencv: Backport updates from OE-Core 2178fd7386 opencv: remove setup_vars_opencv4.sh cafcc65e74 opencv: fix build with protobuf-3.18 when dnn PACKAGECONFIG is enabled 3c022cd50d opencv: Do not lock to gcc only compiler Signed-off-by: Tom Hochstein --- ...ne-argument-version-of-SetTotalBytesLimit.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch (limited to 'recipes-support/opencv/opencv') diff --git a/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch new file mode 100644 index 00000000..5d88d1a6 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch @@ -0,0 +1,41 @@ +From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 +From: Vincent Rabaud +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 + +Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] +Signed-off-by: Martin Jansa +--- + 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 2fc4d84f46..ebecf95eea 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 + #include ++#include + #include + + #include +@@ -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); + } +-- +2.32.0 + -- cgit v1.2.3-54-g00ecf