From owner-svn-ports-head@freebsd.org  Wed Aug 15 19:42:01 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 9A3D0106E256;
 Wed, 15 Aug 2018 19:42:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 41E107764B;
 Wed, 15 Aug 2018 19:42:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EED16FF2;
 Wed, 15 Aug 2018 19:42:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7FJg17a032061;
 Wed, 15 Aug 2018 19:42:01 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7FJg0wD031996;
 Wed, 15 Aug 2018 19:42:00 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201808151942.w7FJg0wD031996@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 15 Aug 2018 19:42:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r477281 - head/graphics/opencv/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/graphics/opencv/files
X-SVN-Commit-Revision: 477281
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Aug 2018 19:42:01 -0000

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);