Merge pull request #15383 from alalek:fix_15379

6 years ago · 114674c3d9
parent c05595e482 d7409604b5
commit 114674c3d9
1 changed files with 10 additions and 0 deletions
--- 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);