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

fixed ocl_integral

Browse Source
This commit is contained in:
Elena Gvozdeva 2014-08-05 11:55:18 +04:00
parent f32b52ea8d
commit 7999fbf765
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgproc/src/opencl/integral_sum.cl
View File

@ -132,8 +132,11 @@ kernel void integral_sum_rows(__global const uchar *buf_ptr, int buf_step, int b
}
dst_sq_offset += dst_sq_step;
dst_sq = (__global sumSQT *)(dst_sq_ptr + mad24(x, dst_sq_step, dst_sq_offset));
dst_sq[0] = 0;
if (x < rows - 1)
{
dst_sq = (__global sumSQT *)(dst_sq_ptr + mad24(x, dst_sq_step, dst_sq_offset));
dst_sq[0] = 0;
}
int buf_sq_index = mad24((int)sizeof(sumSQT), x, buf_sq_offset);
sumSQT accum_sq = 0;

2
modules/imgproc/test/ocl/test_imgproc.cpp
View File

@ -347,7 +347,7 @@ OCL_TEST_P(Integral, Mat2)
OCL_ON(cv::integral(usrc_roi, udst_roi, udst2_roi, sdepth, sqdepth));
Near();
sqdepth == CV_32F ? Near2(2e-4, true) : Near2();
sqdepth == CV_32F ? Near2(1e-6, true) : Near2();
}
}