Merge pull request opencv#9828 from berak:fix_c++17_9572

vpisarev · vpisarev · commit 5e82c98a9ff5 · 2017-10-11T13:31:18.000Z
diff --git a/modules/core/test/test_mat.cpp b/modules/core/test/test_mat.cpp
@@ -133,7 +133,7 @@ int Core_ReduceTest::checkOp( const Mat& src, int dstType, int opType, const Mat
 
     assert( opRes.type() == CV_64FC1 );
     Mat _dst, dst, diff;
-    reduce( src, _dst, dim, opType, dstType );
+    cv::reduce( src, _dst, dim, opType, dstType );
     _dst.convertTo( dst, CV_64FC1 );
 
     absdiff( opRes,dst,diff );
@@ -313,7 +313,7 @@ class Core_PCATest : public cvtest::BaseTest
         Mat rBackPrjTestPoints = rPCA.backProject( rPrjTestPoints );
 
         Mat avg(1, sz.width, CV_32FC1 );
-        reduce( rPoints, avg, 0, CV_REDUCE_AVG );
+        cv::reduce( rPoints, avg, 0, CV_REDUCE_AVG );
         Mat Q = rPoints - repeat( avg, rPoints.rows, 1 ), Qt = Q.t(), eval, evec;
         Q = Qt * Q;
         Q = Q /(float)rPoints.rows;
diff --git a/samples/tapi/tvl1_optical_flow.cpp b/samples/tapi/tvl1_optical_flow.cpp
@@ -37,7 +37,7 @@ template <typename T> inline T clamp (T x, T a, T b)
 
 template <typename T> inline T mapValue(T x, T a, T b, T c, T d)
 {
-    x = clamp(x, a, b);
+    x = ::clamp(x, a, b);
     return c + (d - c) * (x - a) / (b - a);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ template <typename T> inline T clamp (T x, T a, T b)`
`37`	`37`
`38`	`38`	`template <typename T> inline T mapValue(T x, T a, T b, T c, T d)`
`39`	`39`	`{`
`40`		`- x = clamp(x, a, b);`
	`40`	`+ x = ::clamp(x, a, b);`
`41`	`41`	`return c + (d - c) * (x - a) / (b - a);`
`42`	`42`	`}`
`43`	`43`