Merge pull request #15383 from alalek:fix_15379

114674c3 · Alexander Alekhin · c05595e4 · d7409604 · 114674c3
Commit 114674c3 authored 5 years ago by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

mat.inl.hpp modules/core/include/opencv2/core/mat.inl.hpp +10 -0

No files found.
--- a/modules/core/include/opencv2/core/mat.inl.hpp
+++ b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -1744,6 +1744,11 @@ Mat_<_Tp>::Mat_(const std::array<_Tp, _Nm>& arr, bool copyData)
 template<typename _Tp> inline
 Mat_<_Tp>& Mat_<_Tp>::operator = (const Mat& m)
 {
+    if (m.empty())
+    {
+        release();
+        return *this;
+    }
    if( traits::Type<_Tp>::value == m.type() )
    {
        Mat::operator = (m);
@@ -2125,6 +2130,11 @@ Mat_<_Tp>::Mat_(Mat&& m)
 template<typename _Tp> inline
 Mat_<_Tp>& Mat_<_Tp>::operator = (Mat&& m)
 {
+    if (m.empty())
+    {
+        release();
+        return *this;
+    }
    if( traits::Type<_Tp>::value == m.type() )
    {
        Mat::operator = ((Mat&&)m);