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

Merge pull request #10732 from Riyuzakii:10598

Browse Source 
* Introduces error throw for line drawn with THICKNESS=0
This commit is contained in:
Aditya Rohan 2018-02-01 17:51:00 +05:30 committed by Alexander Alekhin
parent 9698b93d10
commit ccea0a831a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/misc/java/test/CoreTest.java
View File

@ -876,7 +876,7 @@ public class CoreTest extends OpenCVTestCase {
Point point1 = new Point(0, 0); Point point1 = new Point(0, 0);
Point point2 = new Point(nPoints, nPoints); Point point2 = new Point(nPoints, nPoints);
Imgproc.line(gray0, point1, point2, colorWhite, 0); Imgproc.line(gray0, point1, point2, colorWhite, 1);
assertTrue(nPoints == Core.countNonZero(gray0)); assertTrue(nPoints == Core.countNonZero(gray0));
} }

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

@ -1814,7 +1814,7 @@ void line( InputOutputArray _img, Point pt1, Point pt2, const Scalar& color,
if( line_type == CV_AA && img.depth() != CV_8U ) if( line_type == CV_AA && img.depth() != CV_8U )
line_type = 8; line_type = 8;
CV_Assert( 0 <= thickness && thickness <= MAX_THICKNESS ); CV_Assert( 0 < thickness && thickness <= MAX_THICKNESS );
CV_Assert( 0 <= shift && shift <= XY_SHIFT ); CV_Assert( 0 <= shift && shift <= XY_SHIFT );
double buf[4]; double buf[4];

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

@ -750,5 +750,11 @@ TEST(Drawing, putText_no_garbage)
} }
TEST(Drawing, line)
{
Mat mat = Mat::zeros(Size(100,100), CV_8UC1);
ASSERT_THROW(line(mat, Point(1,1),Point(99,99),Scalar(255),0), cv::Exception);
}
} // namespace } // namespace