Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
d59a6b29
Commit
d59a6b29
authored
May 07, 2015
by
Marek Nogacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed
http://code.opencv.org/issues/4276
- removed drawing thickness upper limit
parent
f49544f3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
drawing.cpp
modules/imgproc/src/drawing.cpp
+5
-11
No files found.
modules/imgproc/src/drawing.cpp
View file @
d59a6b29
...
...
@@ -1664,7 +1664,7 @@ void line( InputOutputArray _img, Point pt1, Point pt2, const Scalar& color,
if
(
line_type
==
CV_AA
&&
img
.
depth
()
!=
CV_8U
)
line_type
=
8
;
CV_Assert
(
0
<=
thickness
&&
thickness
<=
255
);
CV_Assert
(
0
<=
thickness
);
CV_Assert
(
0
<=
shift
&&
shift
<=
XY_SHIFT
);
double
buf
[
4
];
...
...
@@ -1699,7 +1699,6 @@ void rectangle( InputOutputArray _img, Point pt1, Point pt2,
if
(
lineType
==
CV_AA
&&
img
.
depth
()
!=
CV_8U
)
lineType
=
8
;
CV_Assert
(
thickness
<=
255
);
CV_Assert
(
0
<=
shift
&&
shift
<=
XY_SHIFT
);
double
buf
[
4
];
...
...
@@ -1740,8 +1739,7 @@ void circle( InputOutputArray _img, Point center, int radius,
if
(
line_type
==
CV_AA
&&
img
.
depth
()
!=
CV_8U
)
line_type
=
8
;
CV_Assert
(
radius
>=
0
&&
thickness
<=
255
&&
0
<=
shift
&&
shift
<=
XY_SHIFT
);
CV_Assert
(
radius
>=
0
&&
0
<=
shift
&&
shift
<=
XY_SHIFT
);
double
buf
[
4
];
scalarToRawData
(
color
,
buf
,
img
.
type
(),
0
);
...
...
@@ -1769,7 +1767,7 @@ void ellipse( InputOutputArray _img, Point center, Size axes,
line_type
=
8
;
CV_Assert
(
axes
.
width
>=
0
&&
axes
.
height
>=
0
&&
thickness
<=
255
&&
0
<=
shift
&&
shift
<=
XY_SHIFT
);
0
<=
shift
&&
shift
<=
XY_SHIFT
);
double
buf
[
4
];
scalarToRawData
(
color
,
buf
,
img
.
type
(),
0
);
...
...
@@ -1794,8 +1792,7 @@ void ellipse(InputOutputArray _img, const RotatedRect& box, const Scalar& color,
if
(
lineType
==
CV_AA
&&
img
.
depth
()
!=
CV_8U
)
lineType
=
8
;
CV_Assert
(
box
.
size
.
width
>=
0
&&
box
.
size
.
height
>=
0
&&
thickness
<=
255
);
CV_Assert
(
box
.
size
.
width
>=
0
&&
box
.
size
.
height
>=
0
);
double
buf
[
4
];
scalarToRawData
(
color
,
buf
,
img
.
type
(),
0
);
...
...
@@ -1857,8 +1854,7 @@ void polylines( Mat& img, const Point* const* pts, const int* npts, int ncontour
line_type
=
8
;
CV_Assert
(
pts
&&
npts
&&
ncontours
>=
0
&&
0
<=
thickness
&&
thickness
<=
255
&&
0
<=
shift
&&
shift
<=
XY_SHIFT
);
0
<=
thickness
&&
0
<=
shift
&&
shift
<=
XY_SHIFT
);
double
buf
[
4
];
scalarToRawData
(
color
,
buf
,
img
.
type
(),
0
);
...
...
@@ -2378,8 +2374,6 @@ cvDrawContours( void* _img, CvSeq* contour,
if
(
!
contour
)
return
;
CV_Assert
(
thickness
<=
255
);
scalarToRawData
(
externalColor
,
ext_buf
,
img
.
type
(),
0
);
scalarToRawData
(
holeColor
,
hole_buf
,
img
.
type
(),
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment