mirror of
https://git.freebsd.org/ports.git
synced 2025-06-18 19:20:36 -04:00
d764059958
Renaming didn't help to unblock 3.x progress as co-existence with 2.x was no less complex than simply fixing consumers. This commit also restores directory-level history accidentally lost via git-svn. PR: 210505 Pointy hat to: jbeich (should've discussed first)
11 lines
505 B
C++
11 lines
505 B
C++
--- ./modules/python/src2/cv2.cv.hpp.orig 2013-10-22 17:54:10.000000000 -0400
|
|
+++ ./modules/python/src2/cv2.cv.hpp 2013-10-22 17:55:03.000000000 -0400
|
|
@@ -2169,7 +2169,7 @@
|
|
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);
|