generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return Py_None for an empty mat (should fix #1120)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-06-13 21:47:35 +00:00
parent 619e503d53
commit 3b97f5d5e9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,6 +234,11 @@ static int pyopencv_to(const PyObject* o, Mat& m, const char* name = "<unknown>"
static PyObject* pyopencv_from(const Mat& m) static PyObject* pyopencv_from(const Mat& m)
{ {
if( !m.data )
{
Py_INCREF(Py_None);
return Py_None;
}
Mat temp, *p = (Mat*)&m; Mat temp, *p = (Mat*)&m;
if(!p->refcount || p->allocator != &g_numpyAllocator) if(!p->refcount || p->allocator != &g_numpyAllocator)
{ {