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

try to make a more elegant workaround for the incorrectly generated code in Canny (ticket #157)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-15 20:53:33 +00:00
parent e20994d41c
commit 1fce36a164
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/src/canny.cpp
View File

@ -159,7 +159,7 @@ CV_IMPL void cvCanny( const void* srcarr, void* dstarr,
const short* _dy = (short*)(dy->data.ptr + dy->step*i); const short* _dy = (short*)(dy->data.ptr + dy->step*i);
uchar* _map; uchar* _map;
int x, y; int x, y;
int magstep1, magstep2; ptrdiff_t magstep1, magstep2;
int prev_flag = 0; int prev_flag = 0;
if( i < size.height ) if( i < size.height )
@ -204,8 +204,8 @@ CV_IMPL void cvCanny( const void* srcarr, void* dstarr,
_dx = (short*)(dx->data.ptr + dx->step*(i-1)); _dx = (short*)(dx->data.ptr + dx->step*(i-1));
_dy = (short*)(dy->data.ptr + dy->step*(i-1)); _dy = (short*)(dy->data.ptr + dy->step*(i-1));
magstep1 = (int)(mag_buf[2] - mag_buf[1]); magstep1 = mag_buf[2] - mag_buf[1];
magstep2 = (int)(mag_buf[0] - mag_buf[1]); magstep2 = mag_buf[0] - mag_buf[1];
if( (stack_top - stack_bottom) + size.width > maxsize ) if( (stack_top - stack_bottom) + size.width > maxsize )
{ {