e496edf8b6
- Fix build with modern compilers in the contrib module [1] - Fix build of opencv-core with clang in the ts module [2] - Fix build with QT option [3] - Fix build of py-opencv with clang [4] Reported by: avg [1], Robert Huff <roberthuff@rcn.com> [2] PR: ports/182443 [3], ports/182837 [4] Submitted by: O. Hartmann <ohartman@zedat.fu-berlin.de> [3], pawel [4]
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);
|