Wraps smart pointers properly

cv3d · cv3d · commit c75b589f898f · 2017-04-01T03:19:29.000+09:00
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
@@ -1271,9 +1271,17 @@ PyObject* pyopencv_from(const Moments& m)
                          "nu30", m.nu30, "nu21", m.nu21, "nu12", m.nu12, "nu03", m.nu03);
 }
 
+template<typename T>
+PyObject* pyopencv_from(const cv::Ptr<T>& p)
+{
+    if (!p) return Py_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;
     p = makePtr<T>();
     return pyopencv_to(o, *p, name);
 }

Original file line number	Diff line number	Diff line change
`@@ -1271,9 +1271,17 @@ PyObject* pyopencv_from(const Moments& m)`
`1271`	`1271`	`"nu30", m.nu30, "nu21", m.nu21, "nu12", m.nu12, "nu03", m.nu03);`
`1272`	`1272`	`}`
`1273`	`1273`
	`1274`	`+template<typename T>`
	`1275`	`+PyObject* pyopencv_from(const cv::Ptr<T>& p)`
	`1276`	`+{`
	`1277`	`+ if (!p) return Py_None;`
	`1278`	`+ return pyopencv_from(*p);`
	`1279`	`+}`
	`1280`	`+`
`1274`	`1281`	`template <typename T>`
`1275`	`1282`	`bool pyopencv_to(PyObject o, Ptr<T>& p, const char name)`
`1276`	`1283`	`{`
	`1284`	`+ if (!o \|\| o == Py_None) return true;`
`1277`	`1285`	`p = makePtr<T>();`
`1278`	`1286`	`return pyopencv_to(o, *p, name);`
`1279`	`1287`	`}`