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

Merge pull request #810 from pengx17:master_fix_ocl_tmflag

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-13 16:33:53 +04:00 committed by OpenCV Buildbot
commit a54a307386
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ocl/src/match_template.cpp
View File

@ -101,11 +101,11 @@ namespace cv
static bool useNaive(int method, int depth, Size size) static bool useNaive(int method, int depth, Size size)
{ {
#ifdef HAVE_CLAMDFFT #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; 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; return size.height < 18 && size.width < 18;
} }