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

IPP: fixed ipp_matchTemplate

Browse Source
This commit is contained in:
Elena Gvozdeva 2014-05-15 13:05:27 +04:00
parent cafcfc4d0f
commit ce0b808e3c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -634,7 +634,9 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
#endif #endif
#if defined HAVE_IPP #if defined HAVE_IPP
if (method == CV_TM_SQDIFF && cn == 1) bool useIppMT = (templ.rows < img.rows/2 && templ.cols < img.cols/2);
if (method == CV_TM_SQDIFF && cn == 1 && useIppMT)
{ {
if (ipp_sqrDistance(img, templ, result)) if (ipp_sqrDistance(img, templ, result))
return; return;
@ -643,7 +645,7 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
#endif #endif
#if defined HAVE_IPP #if defined HAVE_IPP
if (cn == 1) if (cn == 1 && useIppMT)
{ {
if (!ipp_crossCorr(img, templ, result)) if (!ipp_crossCorr(img, templ, result))
{ {