Merge pull request opencv#9533 from alalek:regression_test_9507

alalek · alalek · commit 62c6656130a2 · 2017-09-02T06:44:47.000Z
diff --git a/modules/core/test/test_mat.cpp b/modules/core/test/test_mat.cpp
@@ -1399,13 +1399,22 @@ TEST(Core_Matx, fromMat_)
 }
 
 #ifdef CV_CXX11
+
 TEST(Core_Matx, from_initializer_list)
 {
     Mat_<double> a = (Mat_<double>(2,2) << 10, 11, 12, 13);
     Matx22d b = {10, 11, 12, 13};
     ASSERT_EQ( cvtest::norm(a, b, NORM_INF), 0.);
 }
-#endif
+
+TEST(Core_Mat, regression_9507)
+{
+    cv::Mat m = Mat::zeros(5, 5, CV_8UC3);
+    cv::Mat m2{m};
+    EXPECT_EQ(25u, m2.total());
+}
+
+#endif // CXX11
 
 TEST(Core_InputArray, empty)
 {

Original file line number	Diff line number	Diff line change
`@@ -1399,13 +1399,22 @@ TEST(Core_Matx, fromMat_)`
`1399`	`1399`	`}`
`1400`	`1400`
`1401`	`1401`	`#ifdef CV_CXX11`
	`1402`	`+`
`1402`	`1403`	`TEST(Core_Matx, from_initializer_list)`
`1403`	`1404`	`{`
`1404`	`1405`	`Mat_<double> a = (Mat_<double>(2,2) << 10, 11, 12, 13);`
`1405`	`1406`	`Matx22d b = {10, 11, 12, 13};`
`1406`	`1407`	`ASSERT_EQ( cvtest::norm(a, b, NORM_INF), 0.);`
`1407`	`1408`	`}`
`1408`		`-#endif`
	`1409`	`+`
	`1410`	`+TEST(Core_Mat, regression_9507)`
	`1411`	`+{`
	`1412`	`+ cv::Mat m = Mat::zeros(5, 5, CV_8UC3);`
	`1413`	`+ cv::Mat m2{m};`
	`1414`	`+ EXPECT_EQ(25u, m2.total());`
	`1415`	`+}`
	`1416`	`+`
	`1417`	`+#endif // CXX11`
`1409`	`1418`
`1410`	`1419`	`TEST(Core_InputArray, empty)`
`1411`	`1420`	`{`