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

Merge pull request #8936 from terfendail:clipline_fix

Browse Source
This commit is contained in:
Alexander Alekhin 2017-06-30 10:55:08 +00:00
commit a84a5e8f1a
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/imgproc/src/drawing.cpp
View File

@ -111,14 +111,14 @@ bool clipLine( Size2l img_size, Point2l& pt1, Point2l& pt2 )
if( c1 & 12 )
{
a = c1 < 8 ? 0 : bottom;
x1 += (a - y1) * (x2 - x1) / (y2 - y1);
x1 += (int64)((double)(a - y1) * (x2 - x1) / (y2 - y1));
y1 = a;
c1 = (x1 < 0) + (x1 > right) * 2;
}
if( c2 & 12 )
{
a = c2 < 8 ? 0 : bottom;
x2 += (a - y2) * (x2 - x1) / (y2 - y1);
x2 += (int64)((double)(a - y2) * (x2 - x1) / (y2 - y1));
y2 = a;
c2 = (x2 < 0) + (x2 > right) * 2;
}
@ -127,14 +127,14 @@ bool clipLine( Size2l img_size, Point2l& pt1, Point2l& pt2 )
if( c1 )
{
a = c1 == 1 ? 0 : right;
y1 += (a - x1) * (y2 - y1) / (x2 - x1);
y1 += (int64)((double)(a - x1) * (y2 - y1) / (x2 - x1));
x1 = a;
c1 = 0;
}
if( c2 )
{
a = c2 == 1 ? 0 : right;
y2 += (a - x2) * (y2 - y1) / (x2 - x1);
y2 += (int64)((double)(a - x2) * (y2 - y1) / (x2 - x1));
x2 = a;
c2 = 0;
}
@ -314,7 +314,7 @@ LineAA( Mat& img, Point2l pt1, Point2l pt2, const void* color )
if( !((nch == 1 || nch == 3 || nch == 4) && img.depth() == CV_8U) )
{
Line(img, Point((int)(pt1.x<<XY_SHIFT), (int)(pt1.y<<XY_SHIFT)), Point((int)(pt2.x<<XY_SHIFT), (int)(pt2.y<<XY_SHIFT)), color);
Line(img, Point((int)(pt1.x>>XY_SHIFT), (int)(pt1.y>>XY_SHIFT)), Point((int)(pt2.x>>XY_SHIFT), (int)(pt2.y>>XY_SHIFT)), color);
return;
}

25
modules/imgproc/test/test_drawing.cpp
View File

@ -709,6 +709,31 @@ TEST(Drawing, polylines)
ASSERT_EQ(cnt, 21);
}
TEST(Drawing, longline)
{
Mat mat = Mat::zeros(256, 256, CV_8UC1);
line(mat, cv::Point(34, 204), cv::Point(46400, 47400), cv::Scalar(255), 3);
EXPECT_EQ(310, cv::countNonZero(mat));
Point pt[6];
pt[0].x = 32;
pt[0].y = 204;
pt[1].x = 34;
pt[1].y = 202;
pt[2].x = 87;
pt[2].y = 255;
pt[3].x = 82;
pt[3].y = 255;
pt[4].x = 37;
pt[4].y = 210;
pt[5].x = 37;
pt[5].y = 209;
fillConvexPoly(mat, pt, 6, cv::Scalar(0));
EXPECT_EQ(0, cv::countNonZero(mat));
}
TEST(Drawing, putText_no_garbage)
{