Skip to content

O
opencv
Commit c93e2ff8 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #15365 from Zyrin:3.4

parents 0cdfd725 869ea22f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/core/include/opencv2/core/mat.inl.hpp
View file @ c93e2ff8
...@@ -1809,7 +1809,7 @@ Mat_<_Tp> Mat_<_Tp>::cross(const Mat_& m) const ...@@ -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 { ...@@ -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) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment