Merge pull request #2146 from SpecLad:merge-2.4

2014-01-17 16:28:29 +04:00
parent 659c5345d9 092f916db9
commit 79fcc06a4b
50 changed files with 323 additions and 312 deletions
--- a/modules/core/include/opencv2/core/mat.inl.hpp
+++ b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -1918,7 +1918,7 @@ SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
    if( m.type() == DataType<_Tp>::type )
        *this = (const SparseMat_<_Tp>&)m;
    else
-        m.convertTo(this, DataType<_Tp>::type);
+        m.convertTo(*this, DataType<_Tp>::type);
 }

 template<typename _Tp> inline