Merge pull request #4111 from mshabunin:fix-flann-access

This commit is contained in:
Vadim Pisarevsky 2015-06-22 11:53:32 +00:00
commit 945aa06f58

View File

@ -190,9 +190,13 @@ public:
void deallocate(UMatData* u) const
{
if(u)
if(!u)
return;
PyEnsureGIL gil;
CV_Assert(u->urefcount >= 0);
CV_Assert(u->refcount >= 0);
if(u->refcount == 0)
{
PyEnsureGIL gil;
PyObject* o = (PyObject*)u->userdata;
Py_XDECREF(o);
delete u;