Commit 26c9889c authored by Vitaly Tuzov's avatar Vitaly Tuzov

Fix for incorrect line drawing beyond 32768 row or column

parent de85680a
...@@ -177,6 +177,7 @@ public: ...@@ -177,6 +177,7 @@ public:
}; };
typedef Point_<int> Point2i; typedef Point_<int> Point2i;
typedef Point_<int64> Point2l;
typedef Point_<float> Point2f; typedef Point_<float> Point2f;
typedef Point_<double> Point2d; typedef Point_<double> Point2d;
typedef Point2i Point; typedef Point2i Point;
...@@ -308,6 +309,7 @@ public: ...@@ -308,6 +309,7 @@ public:
}; };
typedef Size_<int> Size2i; typedef Size_<int> Size2i;
typedef Size_<int64> Size2l;
typedef Size_<float> Size2f; typedef Size_<float> Size2f;
typedef Size_<double> Size2d; typedef Size_<double> Size2d;
typedef Size2i Size; typedef Size2i Size;
......
...@@ -4408,6 +4408,13 @@ it returns true . ...@@ -4408,6 +4408,13 @@ it returns true .
*/ */
CV_EXPORTS bool clipLine(Size imgSize, CV_IN_OUT Point& pt1, CV_IN_OUT Point& pt2); 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 /** @overload
@param imgRect Image rectangle. @param imgRect Image rectangle.
@param pt1 First line point. @param pt1 First line point.
...@@ -4433,6 +4440,20 @@ CV_EXPORTS_W void ellipse2Poly( Point center, Size axes, int angle, ...@@ -4433,6 +4440,20 @@ CV_EXPORTS_W void ellipse2Poly( Point center, Size axes, int angle,
int arcStart, int arcEnd, int delta, int arcStart, int arcEnd, int delta,
CV_OUT std::vector<Point>& pts ); 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. /** @brief Draws a text string.
The function putText renders the specified text string in the image. Symbols that cannot be rendered The function putText renders the specified text string in the image. Symbols that cannot be rendered
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment