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

added dft for all platforms

Browse Source
This commit is contained in:
Elena Gvozdeva 2014-07-29 12:07:21 +04:00
parent dc3c691c8c
commit dbb5993d13
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,12 +110,8 @@ static bool sumTemplate(InputArray _src, UMat & result)
static bool useNaive(Size size) static bool useNaive(Size size)
{ {
if (!ocl::Device::getDefault().isIntel())
return true;
int dft_size = 18; int dft_size = 18;
return size.height < dft_size && size.width < dft_size; return size.height < dft_size && size.width < dft_size;
} }
struct ConvolveBuf struct ConvolveBuf
@ -138,7 +134,7 @@ void ConvolveBuf::create(Size image_size, Size templ_size)
const double blockScale = 4.5; const double blockScale = 4.5;
const int minBlockSize = 256; const int minBlockSize = 256;
block_size.width = cvRound(result_size.width*blockScale); block_size.width = cvRound(result_size.width*blockScale);
block_size.width = MAX( block_size.width, minBlockSize - templ_size.width + 1 ); block_size.width = MAX( block_size.width, minBlockSize - templ_size.width + 1 );
block_size.width = std::min( block_size.width, result_size.width ); block_size.width = std::min( block_size.width, result_size.width );
@ -175,7 +171,7 @@ static bool convolve_dft(InputArray _image, InputArray _templ, OutputArray _resu
ConvolveBuf buf; ConvolveBuf buf;
CV_Assert(_image.type() == CV_32F); CV_Assert(_image.type() == CV_32F);
CV_Assert(_templ.type() == CV_32F); CV_Assert(_templ.type() == CV_32F);
buf.create(_image.size(), _templ.size()); buf.create(_image.size(), _templ.size());
_result.create(buf.result_size, CV_32F); _result.create(buf.result_size, CV_32F);