svn commit: r476652 - in head/graphics/opencv: . files
Steve Wills
swills at FreeBSD.org
Wed Aug 8 20:37:48 UTC 2018
Hi,
Seems like the PORTREVISION bump wasn't required here, no?
Steve
On 8/8/18 2:13 PM, Jan Beich wrote:
> Author: jbeich
> Date: Wed Aug 8 18:13:03 2018
> New Revision: 476652
> URL: https://svnweb.freebsd.org/changeset/ports/476652
>
> Log:
> 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
>
> Added:
> head/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp (contents, props changed)
> Modified:
> head/graphics/opencv/Makefile (contents, props changed)
>
> Modified: head/graphics/opencv/Makefile
> ==============================================================================
> --- head/graphics/opencv/Makefile Wed Aug 8 17:44:05 2018 (r476651)
> +++ head/graphics/opencv/Makefile Wed Aug 8 18:13:03 2018 (r476652)
> @@ -3,7 +3,7 @@
>
> PORTNAME= opencv
> PORTVERSION= 3.4.1
> -PORTREVISION= 1
> +PORTREVISION= 2
> CATEGORIES= graphics
>
> MAINTAINER= ports at FreeBSD.org
>
> Added: head/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp Wed Aug 8 18:13:03 2018 (r476652)
> @@ -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);
>
More information about the svn-ports-all
mailing list