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

fix memory leak for Mat::getUMat() operation

Browse Source
This commit is contained in:
Alexander Alekhin 2014-02-04 17:23:26 +04:00
parent 22146e4b18
commit 83a2b566a3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/mat.inl.hpp
View File

@ -3112,8 +3112,7 @@ UMat::UMat(const UMat& m)
: flags(m.flags), dims(m.dims), rows(m.rows), cols(m.cols), allocator(m.allocator), : flags(m.flags), dims(m.dims), rows(m.rows), cols(m.cols), allocator(m.allocator),
u(m.u), offset(m.offset), size(&rows) u(m.u), offset(m.offset), size(&rows)
{ {
if( u ) addref();
CV_XADD(&(u->urefcount), 1);
if( m.dims <= 2 ) if( m.dims <= 2 )
{ {
step[0] = m.step[0]; step[1] = m.step[1]; step[0] = m.step[0]; step[1] = m.step[1];
@ -3148,8 +3147,7 @@ UMat& UMat::operator = (const UMat& m)
{ {
if( this != &m ) if( this != &m )
{ {
if( m.u ) const_cast<UMat&>(m).addref();
CV_XADD(&(m.u->urefcount), 1);
release(); release();
flags = m.flags; flags = m.flags;
if( dims <= 2 && m.dims <= 2 ) if( dims <= 2 && m.dims <= 2 )

1
modules/core/src/matrix.cpp
View File

@ -191,7 +191,6 @@ public:
bool allocate(UMatData* u, int /*accessFlags*/) const bool allocate(UMatData* u, int /*accessFlags*/) const
{ {
if(!u) return false; if(!u) return false;
CV_XADD(&u->urefcount, 1);
return true; return true;
} }