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

NumpyAllocator: check reference count before actual release, revert flann changes

Browse Source
This commit is contained in:
Maksim Shabunin
2015-06-17 12:07:57 +03:00
parent 26d9a7cd40
commit fef7509eed
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/features2d/src/matchers.cpp
View File

@@ -1022,28 +1022,13 @@ FlannBasedMatcher::FlannBasedMatcher( const Ptr<flann::IndexParams>& _indexParam
void FlannBasedMatcher::add( InputArrayOfArrays _descriptors ) void FlannBasedMatcher::add( InputArrayOfArrays _descriptors )
{ {
DescriptorMatcher::add( _descriptors ); DescriptorMatcher::add( _descriptors );
if(_descriptors.isUMatVector() || _descriptors.isUMat())
{
std::vector<UMat> descriptors; std::vector<UMat> descriptors;
_descriptors.getUMatVector(descriptors); _descriptors.getUMatVector(descriptors);
for( size_t i = 0; i < descriptors.size(); i++ ) for( size_t i = 0; i < descriptors.size(); i++ )
{ {
addedDescCount += descriptors[i].rows; addedDescCount += descriptors[i].rows;
} }
}
else if(_descriptors.isMatVector() || _descriptors.isMat())
{
std::vector<Mat> descriptors;
_descriptors.getMatVector(descriptors);
for( size_t i = 0; i < descriptors.size(); i++ )
{
addedDescCount += descriptors[i].rows;
}
}
else
{
CV_Assert( _descriptors.isUMat() || _descriptors.isUMatVector() || _descriptors.isMat() || _descriptors.isMatVector());
}
} }
void FlannBasedMatcher::clear() void FlannBasedMatcher::clear()

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

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