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

Merge pull request #2617 from ElenaGvozdeva:ipp_matchTemplate

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-04-15 19:56:38 +04:00 committed by OpenCV Buildbot
commit a26bed16e6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/perf/perf_matchTemplate.cpp
View File

@ -42,7 +42,7 @@ PERF_TEST_P(ImgSize_TmplSize_Method, matchTemplateSmall,
method == TM_CCORR_NORMED || method == TM_CCORR_NORMED ||
method == TM_SQDIFF_NORMED || method == TM_SQDIFF_NORMED ||
method == TM_CCOEFF_NORMED; method == TM_CCOEFF_NORMED;
double eps = isNormed ? 1e-6 double eps = isNormed ? 1e-5
: 255 * 255 * tmpl.total() * 1e-6; : 255 * 255 * tmpl.total() * 1e-6;
SANITY_CHECK(result, eps); SANITY_CHECK(result, eps);

9
modules/imgproc/src/templmatch.cpp
View File

@ -423,11 +423,6 @@ void crossCorr( const Mat& img, const Mat& _templ, Mat& corr,
Size corrsize, int ctype, Size corrsize, int ctype,
Point anchor, double delta, int borderType ) 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 double blockScale = 4.5;
const int minBlockSize = 256; const int minBlockSize = 256;
std::vector<uchar> buf; std::vector<uchar> buf;
@ -649,6 +644,10 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
#endif #endif
int cn = img.channels(); 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); crossCorr( img, templ, result, result.size(), result.type(), Point(0,0), 0, 0);
if( method == CV_TM_CCORR ) if( method == CV_TM_CCORR )