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

Removed useless multiplication by 4

Browse Source
This commit is contained in:
Alexander Karsakov
2014-05-27 10:52:20 +04:00
parent 4910242732
commit 8e54845049
2 changed files with 118 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/imgproc/src/pyramids.cpp
View File

@@ -478,12 +478,23 @@ static bool ocl_pyrUp( InputArray _src, OutputArray _dst, const Size& _dsz, int
doubleSupport ? " -D DOUBLE_SUPPORT" : "",
ocl::typeToStr(depth), channels, local_size
);
ocl::Kernel k("pyrUp", ocl::imgproc::pyr_up_oclsrc, buildOptions);
size_t globalThreads[2];
ocl::Kernel k;
if (ocl::Device::getDefault().isIntel() && channels == 1)
{
k.create("pyrUp_unrolled", ocl::imgproc::pyr_up_oclsrc, buildOptions);
globalThreads[0] = dst.cols/2; globalThreads[1] = dst.rows/2;
}
else
{
k.create("pyrUp", ocl::imgproc::pyr_up_oclsrc, buildOptions);
local_size = 16;
globalThreads[0] = dst.cols; globalThreads[1] = dst.rows;
}
if (k.empty())
return false;
k.args(ocl::KernelArg::ReadOnly(src), ocl::KernelArg::WriteOnly(dst));
size_t globalThreads[2] = {dst.cols/2, dst.rows/2};
size_t localThreads[2] = {local_size, local_size};
return k.run(2, globalThreads, localThreads, false);