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
26c9889c
Commit
26c9889c
authored
Aug 23, 2016
by
Vitaly Tuzov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for incorrect line drawing beyond 32768 row or column
parent
de85680a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
0 deletions
+23
-0
types.hpp
modules/core/include/opencv2/core/types.hpp
+2
-0
imgproc.hpp
modules/imgproc/include/opencv2/imgproc.hpp
+21
-0
drawing.cpp
modules/imgproc/src/drawing.cpp
+0
-0
No files found.
modules/core/include/opencv2/core/types.hpp
View file @
26c9889c
...
...
@@ -177,6 +177,7 @@ public:
};
typedef
Point_
<
int
>
Point2i
;
typedef
Point_
<
int64
>
Point2l
;
typedef
Point_
<
float
>
Point2f
;
typedef
Point_
<
double
>
Point2d
;
typedef
Point2i
Point
;
...
...
@@ -308,6 +309,7 @@ public:
};
typedef
Size_
<
int
>
Size2i
;
typedef
Size_
<
int64
>
Size2l
;
typedef
Size_
<
float
>
Size2f
;
typedef
Size_
<
double
>
Size2d
;
typedef
Size2i
Size
;
...
...
modules/imgproc/include/opencv2/imgproc.hpp
View file @
26c9889c
...
...
@@ -4408,6 +4408,13 @@ it returns true .
*/
CV_EXPORTS
bool
clipLine
(
Size
imgSize
,
CV_IN_OUT
Point
&
pt1
,
CV_IN_OUT
Point
&
pt2
);
/** @overload
@param imgSize Image size. The image rectangle is Rect(0, 0, imgSize.width, imgSize.height) .
@param pt1 First line point.
@param pt2 Second line point.
*/
CV_EXPORTS
bool
clipLine
(
Size2l
imgSize
,
CV_IN_OUT
Point2l
&
pt1
,
CV_IN_OUT
Point2l
&
pt2
);
/** @overload
@param imgRect Image rectangle.
@param pt1 First line point.
...
...
@@ -4433,6 +4440,20 @@ CV_EXPORTS_W void ellipse2Poly( Point center, Size axes, int angle,
int
arcStart
,
int
arcEnd
,
int
delta
,
CV_OUT
std
::
vector
<
Point
>&
pts
);
/** @overload
@param center Center of the arc.
@param axes Half of the size of the ellipse main axes. See the ellipse for details.
@param angle Rotation angle of the ellipse in degrees. See the ellipse for details.
@param arcStart Starting angle of the elliptic arc in degrees.
@param arcEnd Ending angle of the elliptic arc in degrees.
@param delta Angle between the subsequent polyline vertices. It defines the approximation
accuracy.
@param pts Output vector of polyline vertices.
*/
CV_EXPORTS
void
ellipse2Poly
(
Point2d
center
,
Size2d
axes
,
int
angle
,
int
arcStart
,
int
arcEnd
,
int
delta
,
CV_OUT
std
::
vector
<
Point2d
>&
pts
);
/** @brief Draws a text string.
The function putText renders the specified text string in the image. Symbols that cannot be rendered
...
...
modules/imgproc/src/drawing.cpp
View file @
26c9889c
This diff is collapsed.
Click to expand it.
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