Merge pull request #810 from pengx17:master_fix_ocl_tmflag

a54a3073 · Andrey Kamaev · OpenCV Buildbot · 3b364330 · 33361929 · a54a3073
Commit a54a3073 authored Apr 13, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Apr 13, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

match_template.cpp modules/ocl/src/match_template.cpp +2 -2

No files found.
--- a/modules/ocl/src/match_template.cpp
+++ b/modules/ocl/src/match_template.cpp
@@ -101,11 +101,11 @@ namespace cv
        static bool useNaive(int method, int depth, Size size)
        {
 #ifdef HAVE_CLAMDFFT
-            if (method == CV_TM_SQDIFF && (depth == CV_32F || !Context::getContext()->supportsFeature(Context::CL_DOUBLE)))
+            if (method == TM_SQDIFF && (depth == CV_32F || !Context::getContext()->supportsFeature(Context::CL_DOUBLE)))
            {
                return true;
            }
-            else if(method == CV_TM_CCORR || (method == CV_TM_SQDIFF && depth == CV_8U))
+            else if(method == TM_CCORR || (method == TM_SQDIFF && depth == CV_8U))
            {
                return size.height < 18 && size.width < 18;
            }