Merge pull request opencv#9577 from mshabunin:const-foreach

vpisarev · vpisarev · commit 4970a563412a · 2017-09-07T11:12:45.000Z
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -1214,7 +1214,7 @@ void Mat::forEach(const Functor& operation) {
 template<typename _Tp, typename Functor> inline
 void Mat::forEach(const Functor& operation) const {
     // call as not const
-    (const_cast<Mat*>(this))->forEach<const _Tp>(operation);
+    (const_cast<Mat*>(this))->forEach<_Tp>(operation);
 }
 
 template<typename _Tp> inline
diff --git a/modules/core/test/test_mat.cpp b/modules/core/test/test_mat.cpp
@@ -671,6 +671,13 @@ struct InitializerFunctor5D{
     }
 };
 
+template<typename Pixel>
+struct EmptyFunctor
+{
+    void operator()(const Pixel &, const int *) const {}
+};
+
+
 void Core_ArrayOpTest::run( int /* start_from */)
 {
     int errcount = 0;
@@ -799,6 +806,17 @@ void Core_ArrayOpTest::run( int /* start_from */)
         }
     }
 
+    // test const cv::Mat::forEach
+    {
+        const Mat a(10, 10, CV_32SC3);
+        Mat b(10, 10, CV_32SC3);
+        const Mat & c = b;
+        a.forEach<Point3i>(EmptyFunctor<Point3i>());
+        b.forEach<Point3i>(EmptyFunctor<const Point3i>());
+        c.forEach<Point3i>(EmptyFunctor<Point3i>());
+        // tests compilation, no runtime check is needed
+    }
+
     RNG rng;
     const int MAX_DIM = 5, MAX_DIM_SZ = 10;
     // sparse matrix operations

Original file line number	Diff line number	Diff line change
`@@ -1214,7 +1214,7 @@ void Mat::forEach(const Functor& operation) {`
`1214`	`1214`	`template<typename _Tp, typename Functor> inline`
`1215`	`1215`	`void Mat::forEach(const Functor& operation) const {`
`1216`	`1216`	`// call as not const`
`1217`		`- (const_cast<Mat*>(this))->forEach<const _Tp>(operation);`
	`1217`	`+ (const_cast<Mat*>(this))->forEach<_Tp>(operation);`
`1218`	`1218`	`}`
`1219`	`1219`
`1220`	`1220`	`template<typename _Tp> inline`