Commit 3b97f5d5 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

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

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