svn commit: r477281 - head/graphics/opencv/files

Jan Beich jbeich at FreeBSD.org
Wed Aug 15 19:42:01 UTC 2018


Author: jbeich
Date: Wed Aug 15 19:42:00 2018
New Revision: 477281
URL: https://svnweb.freebsd.org/changeset/ports/477281

Log:
  graphics/opencv: switch to upstream Clang 7 fix
  
  Submitted by:	Alexander Alekhin

Modified:
  head/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp   (contents, props changed)

Modified: head/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp
==============================================================================
--- head/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp	Wed Aug 15 19:38:59 2018	(r477280)
+++ head/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp	Wed Aug 15 19:42:00 2018	(r477281)
@@ -1,4 +1,4 @@
-https://github.com/opencv/opencv_contrib/pull/1715
+https://github.com/opencv/opencv_contrib/commit/4e10bc5dae62
 
 --- modules/stereo/src/descriptor.cpp.orig	2018-02-22 13:38:31 UTC
 +++ modules/stereo/src/descriptor.cpp
@@ -8,8 +8,8 @@ https://github.com/opencv/opencv_contrib/pull/1715
          {
 -            CV_Assert(image.size > 0);
 -            CV_Assert(cost.size > 0);
-+            CV_Assert(*image.size > 0);
-+            CV_Assert(*cost.size > 0);
++            CV_Assert(!image.empty());
++            CV_Assert(!cost.empty());
              CV_Assert(windowSize % 2 != 0);
              int win = windowSize / 2;
              float scalling = ((float) 1) / (windowSize * windowSize);


More information about the svn-ports-all mailing list