mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for MSVS compiler optimizer

Browse Source
This commit is contained in:
Alexander Alekhin 2015-08-15 19:06:33 +03:00
parent ac37b77452
commit e65de8d1da
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1746,12 +1746,13 @@ Mat_<_Tp>& Mat_<_Tp>::operator = (Mat&& m)
{ {
if( DataType<_Tp>::type == m.type() ) if( DataType<_Tp>::type == m.type() )
{ {
Mat::operator = (m); Mat::operator = ((Mat&&)m);
return *this; return *this;
} }
if( DataType<_Tp>::depth == m.depth() ) if( DataType<_Tp>::depth == m.depth() )
{ {
return (*this = m.reshape(DataType<_Tp>::channels, m.dims, 0)); Mat::operator = ((Mat&&)m.reshape(DataType<_Tp>::channels, m.dims, 0));
return *this;
} }
CV_DbgAssert(DataType<_Tp>::channels == m.channels()); CV_DbgAssert(DataType<_Tp>::channels == m.channels());
m.convertTo(*this, type()); m.convertTo(*this, type());