Skip to content

O
opencv
Commit 2a0b39d3 authored by Alexander Karsakov's avatar Alexander Karsakov
Browse files
Options

Fixed calculate_histogram kernel

parent eb9fdb01
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/imgproc/src/opencl/histogram.cl
View file @ 2a0b39d3
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define noconvert #define noconvert
__kernel void calculate_histogram(__global const uchar * src, int src_step, int src_offset, int src_rows, int src_cols, __kernel void calculate_histogram(__global const uchar * src_ptr, int src_step, int src_offset, int src_rows, int src_cols,
__global uchar * histptr, int total) __global uchar * histptr, int total)
{ {
int lid = get_local_id(0); int lid = get_local_id(0);
...@@ -61,6 +61,7 @@ __kernel void calculate_histogram(__global const uchar * src, int src_step, int ...@@ -61,6 +61,7 @@ __kernel void calculate_histogram(__global const uchar * src, int src_step, int
localhist[i] = 0; localhist[i] = 0;
barrier(CLK_LOCAL_MEM_FENCE); barrier(CLK_LOCAL_MEM_FENCE);
__global const uchar * src = src_ptr + src_offset;
int src_index; int src_index;
for (int grain = HISTS_COUNT * WGS * kercn; id < total; id += grain) for (int grain = HISTS_COUNT * WGS * kercn; id < total; id += grain)
...@@ -68,7 +69,7 @@ __kernel void calculate_histogram(__global const uchar * src, int src_step, int ...@@ -68,7 +69,7 @@ __kernel void calculate_histogram(__global const uchar * src, int src_step, int
#ifdef HAVE_SRC_CONT #ifdef HAVE_SRC_CONT
src_index = id; src_index = id;
#else #else
src_index = mad24(id / src_cols, src_step, src_offset + id % src_cols); src_index = mad24(id / src_cols, src_step, id % src_cols);
#endif #endif
#if kercn == 1 #if kercn == 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment