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

Merge pull request #3058 from PhilLab:patch-2

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-11 11:10:17 +00:00
commit a15db2d9cf
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/include/opencv2/core/operations.hpp
View File

@ -2624,6 +2624,8 @@ template<typename _Tp> inline Ptr<_Tp>::Ptr(const Ptr<_Tp>& _ptr)
} }
template<typename _Tp> inline Ptr<_Tp>& Ptr<_Tp>::operator = (const Ptr<_Tp>& _ptr) template<typename _Tp> inline Ptr<_Tp>& Ptr<_Tp>::operator = (const Ptr<_Tp>& _ptr)
{
if (this != &_ptr)
{ {
int* _refcount = _ptr.refcount; int* _refcount = _ptr.refcount;
if( _refcount ) if( _refcount )
@ -2631,6 +2633,7 @@ template<typename _Tp> inline Ptr<_Tp>& Ptr<_Tp>::operator = (const Ptr<_Tp>& _p
release(); release();
obj = _ptr.obj; obj = _ptr.obj;
refcount = _refcount; refcount = _refcount;
}
return *this; return *this;
} }