Import of pkgsrc-2015Q3
This commit is contained in:
16
graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp
Normal file
16
graphics/opencv/patches/patch-modules_python_src2_cv2.cv.hpp
Normal file
@@ -0,0 +1,16 @@
|
||||
$NetBSD: patch-modules_python_src2_cv2.cv.hpp,v 1.1 2015/07/28 16:43:25 rumko 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);
|
||||
Reference in New Issue
Block a user