Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-04-12 15:35:38 +04:00
75 changed files with 1259 additions and 3979 deletions

View File

@@ -396,7 +396,7 @@ static PyObject* pyopencv_from(const Mat& m)
if(!p->refcount || p->allocator != &g_numpyAllocator)
{
temp.allocator = &g_numpyAllocator;
m.copyTo(temp);
ERRWRAP2(m.copyTo(temp));
p = &temp;
}
p->addref();