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

Made the function "clipLine" to work with int64 values instead of int --- otherwise sometimes it returned wrong points coordinates, and it caused the function "line" to crash.

Browse Source
This commit is contained in:
Leonid Beynenson 2012-03-20 11:40:05 +00:00
parent 577dabb8bc
commit a659832df1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/core/src/drawing.cpp
View File

@ -77,9 +77,9 @@ FillConvexPoly( Mat& img, const Point* v, int npts,
bool clipLine( Size img_size, Point& pt1, Point& pt2 )
{
int x1, y1, x2, y2;
int64 x1, y1, x2, y2;
int c1, c2;
int right = img_size.width-1, bottom = img_size.height-1;
int64 right = img_size.width-1, bottom = img_size.height-1;
if( img_size.width <= 0 || img_size.height <= 0 )
return false;
@ -90,18 +90,18 @@ bool clipLine( Size img_size, Point& pt1, Point& pt2 )
if( (c1 & c2) == 0 && (c1 | c2) != 0 )
{
int a;
int64 a;
if( c1 & 12 )
{
a = c1 < 8 ? 0 : bottom;
x1 += (int) (((int64) (a - y1)) * (x2 - x1) / (y2 - y1));
x1 += (int64) (((int64) (a - y1)) * (x2 - x1) / (y2 - y1));
y1 = a;
c1 = (x1 < 0) + (x1 > right) * 2;
}
if( c2 & 12 )
{
a = c2 < 8 ? 0 : bottom;
x2 += (int) (((int64) (a - y2)) * (x2 - x1) / (y2 - y1));
x2 += (int64) (((int64) (a - y2)) * (x2 - x1) / (y2 - y1));
y2 = a;
c2 = (x2 < 0) + (x2 > right) * 2;
}
@ -110,14 +110,14 @@ bool clipLine( Size img_size, Point& pt1, Point& pt2 )
if( c1 )
{
a = c1 == 1 ? 0 : right;
y1 += (int) (((int64) (a - x1)) * (y2 - y1) / (x2 - x1));
y1 += (int64) (((int64) (a - x1)) * (y2 - y1) / (x2 - x1));
x1 = a;
c1 = 0;
}
if( c2 )
{
a = c2 == 1 ? 0 : right;
y2 += (int) (((int64) (a - x2)) * (y2 - y1) / (x2 - x1));
y2 += (int64) (((int64) (a - x2)) * (y2 - y1) / (x2 - x1));
x2 = a;
c2 = 0;
}
@ -125,10 +125,10 @@ bool clipLine( Size img_size, Point& pt1, Point& pt2 )
assert( (c1 & c2) != 0 || (x1 | y1 | x2 | y2) >= 0 );
pt1.x = x1;
pt1.y = y1;
pt2.x = x2;
pt2.y = y2;
pt1.x = (int)x1;
pt1.y = (int)y1;
pt2.x = (int)x2;
pt2.y = (int)y2;
}
return (c1 | c2) == 0;