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

Remove mul24 since id can be larger 2^23

Browse Source
This commit is contained in:
Alexander Karsakov 2014-09-08 13:02:50 +04:00
parent 618c75fe3d
commit c942c6539a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/opencl/meanstddev.cl
View File

@ -68,7 +68,7 @@ __kernel void meanStdDev(__global const uchar * srcptr, int src_step, int src_of
#endif #endif
{ {
#ifdef HAVE_SRC_CONT #ifdef HAVE_SRC_CONT
int src_index = mul24(id, srcTSIZE); int src_index = id * srcTSIZE;
#else #else
int src_index = mad24(id / cols, src_step, mul24(id % cols, srcTSIZE)); int src_index = mad24(id / cols, src_step, mul24(id % cols, srcTSIZE));
#endif #endif

4
modules/core/src/opencl/reduce.cl
View File

@ -578,13 +578,13 @@ __kernel void reduce(__global const uchar * srcptr, int src_step, int src_offset
for (int grain = groupnum * WGS * kercn; id < total; id += grain) for (int grain = groupnum * WGS * kercn; id < total; id += grain)
{ {
#ifdef HAVE_SRC_CONT #ifdef HAVE_SRC_CONT
int src_index = mul24(id, srcTSIZE); int src_index = id * srcTSIZE;
#else #else
int src_index = mad24(id / cols, src_step, mul24(id % cols, srcTSIZE)); int src_index = mad24(id / cols, src_step, mul24(id % cols, srcTSIZE));
#endif #endif
#ifdef HAVE_SRC2 #ifdef HAVE_SRC2
#ifdef HAVE_SRC2_CONT #ifdef HAVE_SRC2_CONT
int src2_index = mul24(id, srcTSIZE); int src2_index = id * srcTSIZE;
#else #else
int src2_index = mad24(id / cols, src2_step, mul24(id % cols, srcTSIZE)); int src2_index = mad24(id / cols, src2_step, mul24(id % cols, srcTSIZE));
#endif #endif