mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-23 01:53:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin 2017-04-01 14:18:42 +00:00
commit 45e866f0e1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/python/src2/cv2.cpp
View File

@ -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);
}