mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6964 from tomoaki0705:fixTypoImgproc

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-07-21 07:27:48 +00:00
commit 1fc655a58f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/imgproc/src/imgwarp.cpp
View File

@ -4617,14 +4617,14 @@ static bool ocl_linearPolar(InputArray _src, OutputArray _dst,
size_t w = dsize.width;
size_t h = dsize.height;
String buildOptions;
unsigned mem_szie = 32;
unsigned mem_size = 32;
if (flags & CV_WARP_INVERSE_MAP)
{
buildOptions = "-D InverseMap";
}
else
{
buildOptions = format("-D ForwardMap -D MEM_SIZE=%d", mem_szie);
buildOptions = format("-D ForwardMap -D MEM_SIZE=%d", mem_size);
}
String retval;
ocl::Program p(ocl::imgproc::linearPolar_oclsrc, buildOptions, retval);
@ -4662,7 +4662,7 @@ static bool ocl_linearPolar(InputArray _src, OutputArray _dst,
}
size_t globalThreads[2] = { (size_t)dsize.width , (size_t)dsize.height };
size_t localThreads[2] = { mem_szie , mem_szie };
size_t localThreads[2] = { mem_size , mem_size };
k.run(2, globalThreads, localThreads, false);
remap(src, _dst, mapx, mapy, flags & cv::INTER_MAX, (flags & CV_WARP_FILL_OUTLIERS) ? cv::BORDER_CONSTANT : cv::BORDER_TRANSPARENT);
return true;
@ -4686,14 +4686,14 @@ static bool ocl_logPolar(InputArray _src, OutputArray _dst,
size_t w = dsize.width;
size_t h = dsize.height;
String buildOptions;
unsigned mem_szie = 32;
unsigned mem_size = 32;
if (flags & CV_WARP_INVERSE_MAP)
{
buildOptions = "-D InverseMap";
}
else
{
buildOptions = format("-D ForwardMap -D MEM_SIZE=%d", mem_szie);
buildOptions = format("-D ForwardMap -D MEM_SIZE=%d", mem_size);
}
String retval;
ocl::Program p(ocl::imgproc::logPolar_oclsrc, buildOptions, retval);
@ -4731,9 +4731,9 @@ static bool ocl_logPolar(InputArray _src, OutputArray _dst,
k.args(ocl_mapx, ocl_mapy, ascale, (float)M, center.x, center.y, ANGLE_BORDER, (unsigned)dsize.width, (unsigned)dsize.height);
}
}
size_t globalThreads[2] = { (size_t)dsize.width , (size_t)dsize.height };
size_t localThreads[2] = { mem_szie , mem_szie };
size_t localThreads[2] = { mem_size , mem_size };
k.run(2, globalThreads, localThreads, false);
remap(src, _dst, mapx, mapy, flags & cv::INTER_MAX, (flags & CV_WARP_FILL_OUTLIERS) ? cv::BORDER_CONSTANT : cv::BORDER_TRANSPARENT);
return true;