Commit 45e866f0 authored by Alexander Alekhin's avatar Alexander Alekhin

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

parents 0ae297ad 89088937
...@@ -1274,14 +1274,16 @@ PyObject* pyopencv_from(const Moments& m) ...@@ -1274,14 +1274,16 @@ PyObject* pyopencv_from(const Moments& m)
template<typename T> template<typename T>
PyObject* pyopencv_from(const cv::Ptr<T>& p) PyObject* pyopencv_from(const cv::Ptr<T>& p)
{ {
if (!p) return Py_None; if (!p)
Py_RETURN_NONE;
return pyopencv_from(*p); return pyopencv_from(*p);
} }
template <typename T> template <typename T>
bool pyopencv_to(PyObject *o, Ptr<T>& p, const char *name) 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>(); p = makePtr<T>();
return pyopencv_to(o, *p, name); return pyopencv_to(o, *p, name);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment