From 3553e9379b986d6be7a07807a8cf0b5ad8dc0c32 Mon Sep 17 00:00:00 2001 From: Elena Gvozdeva Date: Tue, 15 Apr 2014 11:35:30 +0400 Subject: [PATCH] fixed --- modules/imgproc/perf/perf_matchTemplate.cpp | 2 +- modules/imgproc/src/templmatch.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/imgproc/perf/perf_matchTemplate.cpp b/modules/imgproc/perf/perf_matchTemplate.cpp index a1f0dde..bf5e687 100644 --- a/modules/imgproc/perf/perf_matchTemplate.cpp +++ b/modules/imgproc/perf/perf_matchTemplate.cpp @@ -42,7 +42,7 @@ PERF_TEST_P(ImgSize_TmplSize_Method, matchTemplateSmall, method == TM_CCORR_NORMED || method == TM_SQDIFF_NORMED || method == TM_CCOEFF_NORMED; - double eps = isNormed ? 1e-6 + double eps = isNormed ? 1e-5 : 255 * 255 * tmpl.total() * 1e-6; SANITY_CHECK(result, eps); diff --git a/modules/imgproc/src/templmatch.cpp b/modules/imgproc/src/templmatch.cpp index cc4b269..75ae2f7 100644 --- a/modules/imgproc/src/templmatch.cpp +++ b/modules/imgproc/src/templmatch.cpp @@ -423,11 +423,6 @@ void crossCorr( const Mat& img, const Mat& _templ, Mat& corr, Size corrsize, int ctype, Point anchor, double delta, int borderType ) { -#if defined HAVE_IPP && IPP_VERSION_MAJOR >= 7 && !defined HAVE_IPP_ICV_ONLY - if (ipp_crossCorr(img, _templ, corr)) - return; -#endif - const double blockScale = 4.5; const int minBlockSize = 256; std::vector buf; @@ -649,6 +644,10 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result, #endif int cn = img.channels(); + +#if defined HAVE_IPP && IPP_VERSION_MAJOR >= 7 && !defined HAVE_IPP_ICV_ONLY + if (!ipp_crossCorr(img, templ, result)) +#endif crossCorr( img, templ, result, result.size(), result.type(), Point(0,0), 0, 0); if( method == CV_TM_CCORR ) -- 2.7.4