Merge pull request #3058 from PhilLab:patch-2

a15db2d9 · Vadim Pisarevsky · 3334b143 · efc1c393 · a15db2d9
Commit a15db2d9 authored Aug 11, 2014 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

operations.hpp modules/core/include/opencv2/core/operations.hpp +3 -0

No files found.
--- a/modules/core/include/opencv2/core/operations.hpp
+++ b/modules/core/include/opencv2/core/operations.hpp
@@ -2625,12 +2625,15 @@ template<typename _Tp> inline Ptr<_Tp>::Ptr(const Ptr<_Tp>& _ptr)

 template<typename _Tp> inline Ptr<_Tp>& Ptr<_Tp>::operator = (const Ptr<_Tp>& _ptr)
 {
+    if (this != &_ptr)
+    {
      int* _refcount = _ptr.refcount;
      if( _refcount )
          CV_XADD(_refcount, 1);
      release();
      obj = _ptr.obj;
      refcount = _refcount;
+    }
    return *this;
 }