Merge pull request #15365 from Zyrin:3.4

pull/15370/head
Alexander Alekhin 6 years ago
commit c93e2ff81d
  1. 6
      modules/core/include/opencv2/core/mat.inl.hpp

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

Loading…
Cancel
Save