generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed cv::log to std::log

Browse Source
This commit is contained in:
pradeep 2014-07-15 12:32:53 +08:00
parent 0d49f97128
commit 7171431e7c
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/imgproc/src/histogram.cpp
View File

@ -2335,7 +2335,7 @@ double cv::compareHist( InputArray _H1, InputArray _H2, int method )
if( fabs(q) <= DBL_EPSILON ) { if( fabs(q) <= DBL_EPSILON ) {
q = 1e-10; q = 1e-10;
} }
result += p * cv::log( p / q ); result += p * std::log( p / q );
} }
} }
else else
@ -2462,7 +2462,7 @@ double cv::compareHist( const SparseMat& H1, const SparseMat& H2, int method )
double v2 = PH2->value<float>(node->idx, (size_t*)&node->hashval); double v2 = PH2->value<float>(node->idx, (size_t*)&node->hashval);
if( !v2 ) if( !v2 )
v2 = 1e-10; v2 = 1e-10;
result += v1 * cv::log( v1 / v2 ); result += v1 * std::log( v1 / v2 );
} }
} }
else else

2
modules/imgproc/test/test_histograms.cpp
View File

@ -1058,7 +1058,7 @@ int CV_CompareHistTest::validate_test_results( int /*test_case_idx*/ )
continue; continue;
if (!v1) if (!v1)
v1 = 1e-10; v1 = 1e-10;
result0[CV_COMP_KL_DIV] += v0 * cv::log( v0 / v1 ); result0[CV_COMP_KL_DIV] += v0 * std::log( v0 / v1 );
} }
} }