mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 11:45:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9506 from alalek:ocl_fix_canny_ub_9496

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-08-30 13:37:44 +00:00
commit d743a4c969
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/imgproc/src/opencl/canny.cl
View File

@ -221,11 +221,11 @@ __kernel void stage1_with_sobel(__global const uchar *src, int src_step, int src
int value = 1;
if (mag0 > low_thr)
{
int a = (y / (float)x) * TG22;
int b = (y / (float)x) * TG67;
float x_ = abs(x);
float y_ = abs(y);
a = min((int)abs(a), 1) + 1;
b = min((int)abs(b), 1);
int a = (y_ * TG22 >= x_) ? 2 : 1;
int b = (y_ * TG67 >= x_) ? 1 : 0;
// a = { 1, 2 }
// b = { 0, 1 }
@ -342,11 +342,11 @@ __kernel void stage1_without_sobel(__global const uchar *dxptr, int dx_step, int
int value = 1;
if (mag0 > low_thr)
{
int a = (y / (float)x) * TG22;
int b = (y / (float)x) * TG67;
float x_ = abs(x);
float y_ = abs(y);
a = min((int)abs(a), 1) + 1;
b = min((int)abs(b), 1);
int a = (y_ * TG22 >= x_) ? 2 : 1;
int b = (y_ * TG67 >= x_) ? 1 : 0;
int dir3 = (a * b) & (((x ^ y) & 0x80000000) >> 31);
int dir = a * b + 2 * dir3;