Merge pull request #2756 from ElenaGvozdeva:ippi_matchTemplate

ada2879f · Alexander Alekhin · OpenCV Buildbot · cafcfc4d · ce0b808e · ada2879f
Commit ada2879f authored May 15, 2014 by Alexander Alekhin Committed by OpenCV Buildbot May 15, 2014
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

templmatch.cpp modules/imgproc/src/templmatch.cpp +4 -2

No files found.
--- a/modules/imgproc/src/templmatch.cpp
+++ b/modules/imgproc/src/templmatch.cpp
@@ -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))
        {