Commit 114674c3 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #15383 from alalek:fix_15379

parents c05595e4 d7409604
...@@ -1744,6 +1744,11 @@ Mat_<_Tp>::Mat_(const std::array<_Tp, _Nm>& arr, bool copyData) ...@@ -1744,6 +1744,11 @@ Mat_<_Tp>::Mat_(const std::array<_Tp, _Nm>& arr, bool copyData)
template<typename _Tp> inline template<typename _Tp> inline
Mat_<_Tp>& Mat_<_Tp>::operator = (const Mat& m) Mat_<_Tp>& Mat_<_Tp>::operator = (const Mat& m)
{ {
if (m.empty())
{
release();
return *this;
}
if( traits::Type<_Tp>::value == m.type() ) if( traits::Type<_Tp>::value == m.type() )
{ {
Mat::operator = (m); Mat::operator = (m);
...@@ -2125,6 +2130,11 @@ Mat_<_Tp>::Mat_(Mat&& m) ...@@ -2125,6 +2130,11 @@ Mat_<_Tp>::Mat_(Mat&& m)
template<typename _Tp> inline template<typename _Tp> inline
Mat_<_Tp>& Mat_<_Tp>::operator = (Mat&& m) Mat_<_Tp>& Mat_<_Tp>::operator = (Mat&& m)
{ {
if (m.empty())
{
release();
return *this;
}
if( traits::Type<_Tp>::value == m.type() ) if( traits::Type<_Tp>::value == m.type() )
{ {
Mat::operator = ((Mat&&)m); Mat::operator = ((Mat&&)m);
......
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