mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 10:40:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15365 from Zyrin:3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2019-08-21 15:55:25 +00:00
commit c93e2ff81d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1809,7 +1809,7 @@ Mat_<_Tp> Mat_<_Tp>::cross(const Mat_& m) const
template<typename _Tp> template<typename T2> inline template<typename _Tp> template<typename T2> inline
Mat_<_Tp>::operator Mat_<T2>() const Mat_<_Tp>::operator Mat_<T2>() const
{ {
return Mat_<T2>(*this); return Mat_<T2>(static_cast<const Mat&>(*this));
} }
template<typename _Tp> inline template<typename _Tp> inline
@ -2103,7 +2103,7 @@ void Mat_<_Tp>::forEach(const Functor& operation) const {
template<typename _Tp> inline template<typename _Tp> inline
Mat_<_Tp>::Mat_(Mat_&& m) Mat_<_Tp>::Mat_(Mat_&& m)
: Mat(m) : Mat(std::move(m))
{ {
} }
@ -2119,7 +2119,7 @@ Mat_<_Tp>::Mat_(Mat&& m)
: Mat() : Mat()
{ {
flags = (flags & ~CV_MAT_TYPE_MASK) | traits::Type<_Tp>::value; flags = (flags & ~CV_MAT_TYPE_MASK) | traits::Type<_Tp>::value;
*this = m; *this = std::move(m);
} }
template<typename _Tp> inline template<typename _Tp> inline