Merge pull request opencv#8698 from cdcseacave:fix_Mat_release

vpisarev · vpisarev · commit b59df66709c1 · 2017-05-23T10:44:12.000Z
diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp
@@ -2185,6 +2185,8 @@ template<typename _Tp> class Mat_ : public Mat
     void create(Size _size);
     //! equivalent to Mat::create(_ndims, _sizes, DatType<_Tp>::type)
     void create(int _ndims, const int* _sizes);
+    //! equivalent to Mat::release()
+    void release();
     //! cross-product
     Mat_ cross(const Mat_& m) const;
     //! data type conversion
@@ -2676,11 +2678,11 @@ class CV_EXPORTS SparseMat
     /*!
         @param [out] m - output matrix; if it does not have a proper size or type before the operation,
             it is reallocated
-        @param [in] rtype – desired output matrix type or, rather, the depth since the number of channels
+        @param [in] rtype - desired output matrix type or, rather, the depth since the number of channels
             are the same as the input has; if rtype is negative, the output matrix will have the
             same type as the input.
-        @param [in] alpha – optional scale factor
-        @param [in] beta – optional delta added to the scaled values
+        @param [in] alpha - optional scale factor
+        @param [in] beta - optional delta added to the scaled values
     */
     void convertTo( Mat& m, int rtype, double alpha=1, double beta=0 ) const;
 
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -1625,6 +1625,15 @@ void Mat_<_Tp>::create(int _dims, const int* _sz)
     Mat::create(_dims, _sz, DataType<_Tp>::type);
 }
 
+template<typename _Tp> inline
+void Mat_<_Tp>::release()
+{
+    Mat::release();
+#ifdef _DEBUG
+    flags = (flags & ~CV_MAT_TYPE_MASK) | DataType<_Tp>::type;
+#endif
+}
+
 template<typename _Tp> inline
 Mat_<_Tp> Mat_<_Tp>::cross(const Mat_& m) const
 {
diff --git a/modules/core/test/test_mat.cpp b/modules/core/test/test_mat.cpp
@@ -1725,4 +1725,12 @@ TEST(Core_Mat_array, SplitMerge)
         EXPECT_EQ(0, countNonZero(diff));
     }
 }
-#endif
+#endif
+
+TEST(Mat, regression_8680)
+{
+   Mat_<Point2i> mat(3,1);
+   ASSERT_EQ(mat.channels(), 2);
+   mat.release();
+   ASSERT_EQ(mat.channels(), 2);
+}

Original file line number	Diff line number	Diff line change
`@@ -1725,4 +1725,12 @@ TEST(Core_Mat_array, SplitMerge)`
`1725`	`1725`	`EXPECT_EQ(0, countNonZero(diff));`
`1726`	`1726`	`}`
`1727`	`1727`	`}`
`1728`		`-#endif`
	`1728`	`+#endif`
	`1729`	`+`
	`1730`	`+TEST(Mat, regression_8680)`
	`1731`	`+{`
	`1732`	`+ Mat_<Point2i> mat(3,1);`
	`1733`	`+ ASSERT_EQ(mat.channels(), 2);`
	`1734`	`+ mat.release();`
	`1735`	`+ ASSERT_EQ(mat.channels(), 2);`
	`1736`	`+}`