mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix c++17 namsespace issues

Browse Source
This commit is contained in:
berak 2017-10-11 09:50:22 +02:00
parent a9effeeb35
commit ada753a54c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/test/test_mat.cpp
View File

@ -133,7 +133,7 @@ int Core_ReduceTest::checkOp( const Mat& src, int dstType, int opType, const Mat
assert( opRes.type() == CV_64FC1 ); assert( opRes.type() == CV_64FC1 );
Mat _dst, dst, diff; Mat _dst, dst, diff;
reduce( src, _dst, dim, opType, dstType ); cv::reduce( src, _dst, dim, opType, dstType );
_dst.convertTo( dst, CV_64FC1 ); _dst.convertTo( dst, CV_64FC1 );
absdiff( opRes,dst,diff ); absdiff( opRes,dst,diff );
@ -313,7 +313,7 @@ protected:
Mat rBackPrjTestPoints = rPCA.backProject( rPrjTestPoints ); Mat rBackPrjTestPoints = rPCA.backProject( rPrjTestPoints );
Mat avg(1, sz.width, CV_32FC1 ); 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; Mat Q = rPoints - repeat( avg, rPoints.rows, 1 ), Qt = Q.t(), eval, evec;
Q = Qt * Q; Q = Qt * Q;
Q = Q /(float)rPoints.rows; Q = Q /(float)rPoints.rows;

2
samples/tapi/tvl1_optical_flow.cpp
View File

@ -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) 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); return c + (d - c) * (x - a) / (b - a);
} }