From 606df0469aa990590d78a7b66444c054d943496e Mon Sep 17 00:00:00 2001 From: vbystricky Date: Mon, 16 Jun 2014 18:14:05 +0400 Subject: [PATCH] Fix pointer conversion --- modules/imgproc/src/opencl/integral_sum.cl | 10 +++++----- modules/imgproc/src/sumpixels.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/imgproc/src/opencl/integral_sum.cl b/modules/imgproc/src/opencl/integral_sum.cl index a5a2ffd2a6..333c7121cb 100644 --- a/modules/imgproc/src/opencl/integral_sum.cl +++ b/modules/imgproc/src/opencl/integral_sum.cl @@ -71,10 +71,10 @@ #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) { - sumT *sum = (sumT *)sum_ptr; + __global sumT *sum = (__global sumT *)sum_ptr; int lid = get_local_id(0); int gid = get_group_id(0); vecSumT src_t[2], sum_t[2]; @@ -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) { - vecSumT *srcsum = (vecSumT *)srcsum_ptr; - sumT *sum = (sumT *)sum_ptr; + __global const vecSumT *srcsum = (__global const vecSumT *)srcsum_ptr; + __global sumT *sum = (__global sumT *)sum_ptr; int lid = get_local_id(0); int gid = get_group_id(0); vecSumT src_t[2], sum_t[2]; diff --git a/modules/imgproc/src/sumpixels.cpp b/modules/imgproc/src/sumpixels.cpp index 6b0183afa1..1d246ec7bc 100755 --- a/modules/imgproc/src/sumpixels.cpp +++ b/modules/imgproc/src/sumpixels.cpp @@ -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, 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); size_t gt2 = t_sum.cols * 32, lt2 = 256; -- GitLab