From 7171431e7c6095e3a59bbea49d15e8f58f0e6c23 Mon Sep 17 00:00:00 2001 From: pradeep Date: Tue, 15 Jul 2014 12:32:53 +0800 Subject: [PATCH] Changed cv::log to std::log --- modules/imgproc/src/histogram.cpp | 4 ++-- modules/imgproc/test/test_histograms.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/src/histogram.cpp b/modules/imgproc/src/histogram.cpp index 97ca3de..909601f 100644 --- a/modules/imgproc/src/histogram.cpp +++ b/modules/imgproc/src/histogram.cpp @@ -2335,7 +2335,7 @@ double cv::compareHist( InputArray _H1, InputArray _H2, int method ) if( fabs(q) <= DBL_EPSILON ) { q = 1e-10; } - result += p * cv::log( p / q ); + result += p * std::log( p / q ); } } else @@ -2462,7 +2462,7 @@ double cv::compareHist( const SparseMat& H1, const SparseMat& H2, int method ) double v2 = PH2->value(node->idx, (size_t*)&node->hashval); if( !v2 ) v2 = 1e-10; - result += v1 * cv::log( v1 / v2 ); + result += v1 * std::log( v1 / v2 ); } } else diff --git a/modules/imgproc/test/test_histograms.cpp b/modules/imgproc/test/test_histograms.cpp index 51c3aab..e9db6fc 100644 --- a/modules/imgproc/test/test_histograms.cpp +++ b/modules/imgproc/test/test_histograms.cpp @@ -1058,7 +1058,7 @@ int CV_CompareHistTest::validate_test_results( int /*test_case_idx*/ ) continue; if (!v1) v1 = 1e-10; - result0[CV_COMP_KL_DIV] += v0 * cv::log( v0 / v1 ); + result0[CV_COMP_KL_DIV] += v0 * std::log( v0 / v1 ); } } -- 2.7.4