From ada753a54c42ffb88bfc54587a2acc212eb80400 Mon Sep 17 00:00:00 2001 From: berak Date: Wed, 11 Oct 2017 09:50:22 +0200 Subject: [PATCH] fix c++17 namsespace issues --- modules/core/test/test_mat.cpp | 4 ++-- samples/tapi/tvl1_optical_flow.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/test/test_mat.cpp b/modules/core/test/test_mat.cpp index 6c2ab85c3c..fdc590766b 100644 --- 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 @@ protected: 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 index 925745fd7f..3d301ee033 100644 --- a/samples/tapi/tvl1_optical_flow.cpp +++ b/samples/tapi/tvl1_optical_flow.cpp @@ -37,7 +37,7 @@ template inline T clamp (T x, T a, T b) template 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); }