1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge pull request #2146 from SpecLad:merge-2.4

This commit is contained in:
Roman Donchenko
2014-01-17 16:28:29 +04:00
committed by OpenCV Buildbot
50 changed files with 323 additions and 312 deletions
@@ -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