head	1.2;
access;
symbols
	pkgsrc-2019Q2:1.1.0.12
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.10
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.8
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.6
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.4
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.2
	pkgsrc-2018Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2019.07.30.15.32.48;	author nia;	state dead;
branches;
next	1.1;
commitid	m76lMmFatBQb85xB;

1.1
date	2018.02.16.17.13.58;	author wiz;	state Exp;
branches;
next	;
commitid	9BumlBnXChLlH6rA;


desc
@@


1.2
log
@Remove graphics/opencv2 replacement graphics/opencv.

This is a legacy version which has received little love since it was
imported, and nothing in pkgsrc is using it.
@
text
@$NetBSD: patch-modules_contrib_src_chamfermatching.cpp,v 1.1 2018/02/16 17:13:58 wiz Exp $

Address of variable is never NULL; some compilers error out about this.

--- modules/contrib/src/chamfermatching.cpp.orig	2015-02-25 12:10:31.000000000 +0000
+++ modules/contrib/src/chamfermatching.cpp
@@@@ -966,10 +966,8 @@@@ void ChamferMatcher::Matching::computeDi
     for (int y=0;y<h;++y) {
         for (int x=0;x<w;++x) {
             // initialize
-            if (&annotate_img!=NULL) {
                 annotate_img.at<Vec2i>(y,x)[0]=x;
                 annotate_img.at<Vec2i>(y,x)[1]=y;
-            }
 
             uchar edge_val = edges_img.at<uchar>(y,x);
             if( (edge_val!=0) ) {
@@@@ -1013,10 +1011,8 @@@@ void ChamferMatcher::Matching::computeDi
                 dist_img.at<float>(ny,nx) = dist;
                 q.push(std::make_pair(nx,ny));
 
-                if (&annotate_img!=NULL) {
                     annotate_img.at<Vec2i>(ny,nx)[0]=annotate_img.at<Vec2i>(y,x)[0];
                     annotate_img.at<Vec2i>(ny,nx)[1]=annotate_img.at<Vec2i>(y,x)[1];
-                }
             }
         }
     }
@@@@ -1108,7 +1104,6 @@@@ ChamferMatcher::Match* ChamferMatcher::M
     float cost = (sum_distance/truncate_)/addr.size();
 
 
-    if (&orientation_img!=NULL) {
         float* optr = orientation_img.ptr<float>(y)+x;
         float sum_orientation = 0;
         int cnt_orientation = 0;
@@@@ -1127,7 +1122,6 @@@@ ChamferMatcher::Match* ChamferMatcher::M
                         cost = (float)(beta*cost+alpha*(sum_orientation/(2*CV_PI))/cnt_orientation);
         }
 
-    }
 
     if(cost > 0){
         ChamferMatcher::Match* istance = new ChamferMatcher::Match();
@


1.1
log
@opencv2: fix build on NetBSD-8.99.12 with gcc6.

Some advice from https://github.com/opencv/opencv/issues/6517

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@