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

Merge pull request #2756 from ElenaGvozdeva:ippi_matchTemplate

Browse Source
This commit is contained in:
Alexander Alekhin 2014-05-15 18:50:00 +04:00 committed by OpenCV Buildbot
commit ada2879faa
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
#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))
return;
@ -643,7 +645,7 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
#endif
#if defined HAVE_IPP
if (cn == 1)
if (cn == 1 && useIppMT)
{
if (!ipp_crossCorr(img, templ, result))
{