head	1.2;
access;
symbols
	pkgsrc-2019Q2:1.1.0.32
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.30
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.28
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.26
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.24
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.22
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.20
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.18
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.14
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.12
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.10
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.8
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.6
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.4
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.2
	pkgsrc-2015Q4-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	2015.10.17.10.28.43;	author fhajny;	state Exp;
branches;
next	;
commitid	aB3tmdk8RUsvRrFy;


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_python_src2_cv2.cv.hpp,v 1.1 2015/10/17 10:28:43 fhajny Exp $

Fix build under clang.
"error: C-style cast from 'nullprt_t' to 'CvNextEdgeType' is not allowed."

--- modules/python/src2/cv2.cv.hpp.orig	2014-04-11 10:15:26.000000000 +0000
+++ modules/python/src2/cv2.cv.hpp
@@@@ -2155,7 +2155,7 @@@@ static int convert_to_CvSubdiv2DPTR(PyOb
 static int convert_to_CvNextEdgeType(PyObject *o, CvNextEdgeType *dst, const char *name = "no_name")
 {
   if (!PyInt_Check(o)) {
-    *dst = (CvNextEdgeType)NULL;
+    *dst = (CvNextEdgeType)0;
     return failmsg("Expected number for CvNextEdgeType argument '%s'", name);
   } else {
     *dst = (CvNextEdgeType)PyInt_AsLong(o);
@


1.1
log
@Import the last state of graphics/opencv before the update to 3.0.0 and
update it to the latest version on the 2.4 branch. The graphics/opencv
base package doesn't yet provide the same range of modules, as upstream
split off some experimental modules into a separate contrib repo.
@
text
@d1 1
a1 1
$NetBSD: patch-modules_python_src2_cv2.cv.hpp,v 1.1 2015/07/28 16:43:25 rumko Exp $
@