Merge pull request opencv#8500 from Sahloul:fixes/wrappers/ptr

alalek · alalek · commit 45e866f0e172 · 2017-04-01T14:18:42.000Z
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
@@ -1274,14 +1274,16 @@ PyObject* pyopencv_from(const Moments& m)
 template<typename T>
 PyObject* pyopencv_from(const cv::Ptr<T>& p)
 {
-    if (!p) return Py_None;
+    if (!p)
+        Py_RETURN_NONE;
     return pyopencv_from(*p);
 }
 
 template <typename T>
 bool pyopencv_to(PyObject *o, Ptr<T>& p, const char *name)
 {
-    if (!o || o == Py_None) return true;
+    if (!o || o == Py_None)
+        return true;
     p = makePtr<T>();
     return pyopencv_to(o, *p, name);
 }

Original file line number	Diff line number	Diff line change
`@@ -1274,14 +1274,16 @@ PyObject* pyopencv_from(const Moments& m)`
`1274`	`1274`	`template<typename T>`
`1275`	`1275`	`PyObject* pyopencv_from(const cv::Ptr<T>& p)`
`1276`	`1276`	`{`
`1277`		`- if (!p) return Py_None;`
	`1277`	`+ if (!p)`
	`1278`	`+ Py_RETURN_NONE;`
`1278`	`1279`	`return pyopencv_from(*p);`
`1279`	`1280`	`}`
`1280`	`1281`
`1281`	`1282`	`template <typename T>`
`1282`	`1283`	`bool pyopencv_to(PyObject o, Ptr<T>& p, const char name)`
`1283`	`1284`	`{`
`1284`		`- if (!o \|\| o == Py_None) return true;`
	`1285`	`+ if (!o \|\| o == Py_None)`
	`1286`	`+ return true;`
`1285`	`1287`	`p = makePtr<T>();`
`1286`	`1288`	`return pyopencv_to(o, *p, name);`
`1287`	`1289`	`}`