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

Merge pull request #26744 from Diego1V:fixHoughSIGSEGV

Browse Source 
Fix #26086 - Update types inside HoughLinesProbabilistic
This commit is contained in:
Alexander Smorkalov 2025-01-13 13:05:21 +03:00 committed by GitHub
commit 6931a4cc06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/imgproc/src/hough.cpp
View File

@ -575,7 +575,8 @@ HoughLinesProbabilistic( Mat& image,
Point line_end[2]; Point line_end[2];
float a, b; float a, b;
int* adata = accum.ptr<int>(); int* adata = accum.ptr<int>();
int i = point.y, j = point.x, k, x0, y0, dx0, dy0, xflag; int i = point.y, j = point.x, k, xflag;
int64_t x0, y0, dx0, dy0;
int good_line; int good_line;
const int shift = 16; const int shift = 16;
@ -626,8 +627,8 @@ HoughLinesProbabilistic( Mat& image,
for( k = 0; k < 2; k++ ) for( k = 0; k < 2; k++ )
{ {
int gap = 0, x = x0, y = y0, dx = dx0, dy = dy0; int gap = 0;
int64_t x = x0, y = y0, dx = dx0, dy = dy0 ;
if( k > 0 ) if( k > 0 )
dx = -dx, dy = -dy; dx = -dx, dy = -dy;
@ -636,7 +637,7 @@ HoughLinesProbabilistic( Mat& image,
for( ;; x += dx, y += dy ) for( ;; x += dx, y += dy )
{ {
uchar* mdata; uchar* mdata;
int i1, j1; int64_t i1, j1;
if( xflag ) if( xflag )
{ {
@ -661,8 +662,8 @@ HoughLinesProbabilistic( Mat& image,
if( *mdata ) if( *mdata )
{ {
gap = 0; gap = 0;
line_end[k].y = i1; line_end[k].y = static_cast<int>(i1);
line_end[k].x = j1; line_end[k].x = static_cast<int>(j1);
} }
else if( ++gap > lineGap ) else if( ++gap > lineGap )
break; break;
@ -674,7 +675,7 @@ HoughLinesProbabilistic( Mat& image,
for( k = 0; k < 2; k++ ) for( k = 0; k < 2; k++ )
{ {
int x = x0, y = y0, dx = dx0, dy = dy0; int64_t x = x0, y = y0, dx = dx0, dy = dy0;
if( k > 0 ) if( k > 0 )
dx = -dx, dy = -dy; dx = -dx, dy = -dy;
@ -684,7 +685,7 @@ HoughLinesProbabilistic( Mat& image,
for( ;; x += dx, y += dy ) for( ;; x += dx, y += dy )
{ {
uchar* mdata; uchar* mdata;
int i1, j1; int64_t i1, j1;
if( xflag ) if( xflag )
{ {