提交 606df046 编写于 作者: V vbystricky

Fix pointer conversion

上级 9bf296ee
...@@ -71,10 +71,10 @@ ...@@ -71,10 +71,10 @@
#endif #endif
kernel void integral_sum_cols(__global uchar4 *src, __global uchar *sum_ptr, kernel void integral_sum_cols(__global const uchar4 *src, __global uchar *sum_ptr,
int src_offset, int rows, int cols, int src_step, int dst_step) int src_offset, int rows, int cols, int src_step, int dst_step)
{ {
sumT *sum = (sumT *)sum_ptr; __global sumT *sum = (__global sumT *)sum_ptr;
int lid = get_local_id(0); int lid = get_local_id(0);
int gid = get_group_id(0); int gid = get_group_id(0);
vecSumT src_t[2], sum_t[2]; vecSumT src_t[2], sum_t[2];
...@@ -173,11 +173,11 @@ kernel void integral_sum_cols(__global uchar4 *src, __global uchar *sum_ptr, ...@@ -173,11 +173,11 @@ kernel void integral_sum_cols(__global uchar4 *src, __global uchar *sum_ptr,
} }
kernel void integral_sum_rows(__global uchar *srcsum_ptr, __global uchar *sum_ptr, kernel void integral_sum_rows(__global const uchar *srcsum_ptr, __global uchar *sum_ptr,
int rows, int cols, int src_step, int sum_step, int sum_offset) int rows, int cols, int src_step, int sum_step, int sum_offset)
{ {
vecSumT *srcsum = (vecSumT *)srcsum_ptr; __global const vecSumT *srcsum = (__global const vecSumT *)srcsum_ptr;
sumT *sum = (sumT *)sum_ptr; __global sumT *sum = (__global sumT *)sum_ptr;
int lid = get_local_id(0); int lid = get_local_id(0);
int gid = get_group_id(0); int gid = get_group_id(0);
vecSumT src_t[2], sum_t[2]; vecSumT src_t[2], sum_t[2];
......
...@@ -266,7 +266,7 @@ static bool ocl_integral( InputArray _src, OutputArray _sum, int sdepth ) ...@@ -266,7 +266,7 @@ static bool ocl_integral( InputArray _src, OutputArray _sum, int sdepth )
ocl::Kernel k2("integral_sum_rows", ocl::imgproc::integral_sum_oclsrc, ocl::Kernel k2("integral_sum_rows", ocl::imgproc::integral_sum_oclsrc,
format("-D sdepth=%d", sdepth)); format("-D sdepth=%d", sdepth));
k2.args(ocl::KernelArg::PtrReadWrite(t_sum), ocl::KernelArg::PtrWriteOnly(sum), k2.args(ocl::KernelArg::PtrReadOnly(t_sum), ocl::KernelArg::PtrWriteOnly(sum),
t_sum.rows, t_sum.cols, (int)t_sum.step, (int)sum.step, sum_offset); t_sum.rows, t_sum.cols, (int)t_sum.step, (int)sum.step, sum_offset);
size_t gt2 = t_sum.cols * 32, lt2 = 256; size_t gt2 = t_sum.cols * 32, lt2 = 256;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册