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

multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-08-16 00:29:10 +04:00
parent daaa5a1824
commit e9729a9601
13 changed files with 72 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgproc/src/morph.cpp
View File

@@ -1531,7 +1531,7 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
if (dev.isIntel() && !(dev.type() & ocl::Device::TYPE_CPU) &&
((ksize.width < 5 && ksize.height < 5 && esz <= 4) ||
(ksize.width == 5 && ksize.height == 5 && cn == 1)) &&
(iterations == 1))
(iterations == 1) && cn == 1)
{
if (ocl_morphSmall(_src, _dst, kernel, anchor, borderType, op, actual_op, _extraMat))
return true;
@@ -1543,13 +1543,18 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
return true;
}
#ifdef ANDROID
#if defined ANDROID
size_t localThreads[2] = { 16, 8 };
#else
size_t localThreads[2] = { 16, 16 };
#endif
size_t globalThreads[2] = { ssize.width, ssize.height };
#ifdef __APPLE__
if( actual_op != MORPH_ERODE && actual_op != MORPH_DILATE )
localThreads[0] = localThreads[1] = 4;
#endif
if (localThreads[0]*localThreads[1] * 2 < (localThreads[0] + ksize.width - 1) * (localThreads[1] + ksize.height - 1))
return false;