From owner-svn-ports-all@freebsd.org Wed Aug 8 20:37:48 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 549FC106A472; Wed, 8 Aug 2018 20:37:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id F055E92E5F; Wed, 8 Aug 2018 20:37:47 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from lrrr.mouf.net (cpe-174-109-174-192.nc.res.rr.com [174.109.174.192]) (authenticated bits=0) by mouf.net (8.14.9/8.14.9) with ESMTP id w78KbduF001589 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Wed, 8 Aug 2018 20:37:45 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r476652 - in head/graphics/opencv: . files To: Jan Beich , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <201808081813.w78ID4Bl023603@repo.freebsd.org> From: Steve Wills Message-ID: <415024ac-10e3-0e53-8d9d-d683dc7d6067@FreeBSD.org> Date: Wed, 8 Aug 2018 16:37:34 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <201808081813.w78ID4Bl023603@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Wed, 08 Aug 2018 20:37:46 +0000 (UTC) X-Spam-Status: No, score=0.0 required=4.5 tests=none autolearn=unavailable autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mouf.net X-Virus-Scanned: clamav-milter 0.99.2 at mouf.net X-Virus-Status: Clean X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2018 20:37:48 -0000 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@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); >