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

Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround

Browse Source
This commit is contained in:
Roman Donchenko 2013-11-20 18:19:07 +04:00 committed by OpenCV Buildbot
commit 70a4de20d7
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ocl/src/arithm.cpp
View File

@ -603,6 +603,12 @@ static void arithm_absdiff_nonsaturate_run(const oclMat & src1, const oclMat & s
} }
CV_Assert(src1.step % src1.elemSize() == 0 && (src2.empty() || src2.step % src2.elemSize() == 0)); CV_Assert(src1.step % src1.elemSize() == 0 && (src2.empty() || src2.step % src2.elemSize() == 0));
if (src2.empty() && (src1.depth() == CV_8U || src1.depth() == CV_16U))
{
src1.convertTo(diff, CV_32S);
return;
}
int ddepth = std::max(src1.depth(), CV_32S); int ddepth = std::max(src1.depth(), CV_32S);
if (ntype == NORM_L2) if (ntype == NORM_L2)
ddepth = std::max<int>(CV_32F, ddepth); ddepth = std::max<int>(CV_32F, ddepth);
@ -639,6 +645,7 @@ static void arithm_absdiff_nonsaturate_run(const oclMat & src1, const oclMat & s
args.push_back( make_pair( sizeof(cl_int), (void *)&src2offset1 )); args.push_back( make_pair( sizeof(cl_int), (void *)&src2offset1 ));
kernelName += "_binary"; kernelName += "_binary";
buildOptions += " -D BINARY";
} }
args.push_back( make_pair( sizeof(cl_mem), (void *)&diff.data )); args.push_back( make_pair( sizeof(cl_mem), (void *)&diff.data ));

6
modules/ocl/src/opencl/arithm_absdiff_nonsaturate.cl
View File

@ -52,6 +52,8 @@
#endif #endif
#endif #endif
#ifdef BINARY
__kernel void arithm_absdiff_nonsaturate_binary(__global srcT *src1, int src1_step, int src1_offset, __kernel void arithm_absdiff_nonsaturate_binary(__global srcT *src1, int src1_step, int src1_offset,
__global srcT *src2, int src2_step, int src2_offset, __global srcT *src2, int src2_step, int src2_offset,
__global dstT *dst, int dst_step, int dst_offset, __global dstT *dst, int dst_step, int dst_offset,
@ -78,6 +80,8 @@ __kernel void arithm_absdiff_nonsaturate_binary(__global srcT *src1, int src1_st
} }
} }
#else
__kernel void arithm_absdiff_nonsaturate(__global srcT *src1, int src1_step, int src1_offset, __kernel void arithm_absdiff_nonsaturate(__global srcT *src1, int src1_step, int src1_offset,
__global dstT *dst, int dst_step, int dst_offset, __global dstT *dst, int dst_step, int dst_offset,
int cols, int rows) int cols, int rows)
@ -99,3 +103,5 @@ __kernel void arithm_absdiff_nonsaturate(__global srcT *src1, int src1_step, int
} }
} }
} }
#endif