From: krodyush Date: Mon, 7 Apr 2014 13:32:39 +0000 (+0400) Subject: fix previous merge error X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3308^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=616ec74beb74a7f26df87f51e3c8c3f798da7bb8;p=platform%2Fupstream%2Fopencv.git fix previous merge error --- diff --git a/modules/video/src/opencl/pyrlk.cl b/modules/video/src/opencl/pyrlk.cl index 1e27c8a..cf40105 100644 --- a/modules/video/src/opencl/pyrlk.cl +++ b/modules/video/src/opencl/pyrlk.cl @@ -297,7 +297,7 @@ void ReadPatchIToLocalMem(image2d_t I, float2 Point, local float IPatchLocal[LSy __attribute__((reqd_work_group_size(LSx, LSy, 1))) __kernel void lkSparse(image2d_t I, image2d_t J, - __global const float2* prevPts, int prevPtsStep, __global float2* nextPts, int nextPtsStep, __global uchar* status, __global float* err, + __global const float2* prevPts, __global float2* nextPts, __global uchar* status, __global float* err, const int level, const int rows, const int cols, int PATCH_X, int PATCH_Y, int c_winSize_x, int c_winSize_y, int c_iters, char calcErr) { __local float smem1[BUFFER];