diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-08-08 18:13:03 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-08-08 18:13:03 +0000 |
| commit | 1f5d458a0045284621dd5d25320ade68f366b2a8 (patch) | |
| tree | 5522ad0831ba77d7e1b485263d15aa55c85bc616 | |
| parent | databases/xtrabackup: Revert depdendency removal (diff) | |
graphics/opencv: unbreak with clang 7
modules/stereo/src/descriptor.cpp:229:34: error: ordered comparison between pointer and zero ('const int *' and 'int')
CV_Assert(image.size > 0);
~~~~~~~~~~ ^ ~
modules/stereo/src/descriptor.cpp:230:33: error: ordered comparison between pointer and zero ('const int *' and 'int')
CV_Assert(cost.size > 0);
~~~~~~~~~ ^ ~
modules/core/include/opencv2/core/base.hpp:478:84: note: expanded from macro 'CV_Assert'
#define CV_Assert(...) do { CVAUX_CONCAT(CV_Assert_, CV_VA_NUM_ARGS(__VA_ARGS__)) (__VA_ARGS__); } while(0)
^~~~~~~~~~~
modules/core/include/opencv2/core/base.hpp:455:35: note: expanded from macro 'CV_Assert_1'
#define CV_Assert_1( expr ) if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ )
^~~~
PR: 230355
| -rw-r--r-- | graphics/opencv/Makefile | 2 | ||||
| -rw-r--r-- | graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 2a51c94e2528..89f5e14e0ef0 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -3,7 +3,7 @@ PORTNAME= opencv PORTVERSION= 3.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp b/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp new file mode 100644 index 000000000000..58b3753ad832 --- /dev/null +++ b/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp @@ -0,0 +1,15 @@ +https://github.com/opencv/opencv_contrib/pull/1715 + +--- modules/stereo/src/descriptor.cpp.orig 2018-02-22 13:38:31 UTC ++++ modules/stereo/src/descriptor.cpp +@@ -226,8 +226,8 @@ namespace cv + //integral image computation used in the Mean Variation Census Transform + void imageMeanKernelSize(const Mat &image, int windowSize, Mat &cost) + { +- CV_Assert(image.size > 0); +- CV_Assert(cost.size > 0); ++ CV_Assert(*image.size > 0); ++ CV_Assert(*cost.size > 0); + CV_Assert(windowSize % 2 != 0); + int win = windowSize / 2; + float scalling = ((float) 1) / (windowSize * windowSize); |