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

fixed

Browse Source
This commit is contained in:
Elena Gvozdeva
2014-01-17 16:26:11 +04:00
parent 4da1ba56b3
commit 7e2bdb590f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -571,7 +571,9 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
bool swapNotNeed = (_img.size().height >= _templ.size().height && _img.size().width >= _templ.size().width); bool swapNotNeed = (_img.size().height >= _templ.size().height && _img.size().width >= _templ.size().width);
if (!swapNotNeed) if (!swapNotNeed)
{
CV_Assert(_img.size().height <= _templ.size().height && _img.size().width <= _templ.size().width); CV_Assert(_img.size().height <= _templ.size().height && _img.size().width <= _templ.size().width);
}
bool use_opencl = ocl::useOpenCL() && _result.isUMat(); bool use_opencl = ocl::useOpenCL() && _result.isUMat();
if ( use_opencl && (swapNotNeed ? ocl_matchTemplate(_img,_templ,_result,method) : ocl_matchTemplate(_templ,_img,_result,method))) if ( use_opencl && (swapNotNeed ? ocl_matchTemplate(_img,_templ,_result,method) : ocl_matchTemplate(_templ,_img,_result,method)))