@@ -407,7 +407,7 @@ template<typename _Tp> class Allocator
407
407
The class is specialized for each fundamental numerical data type supported by OpenCV.
408
408
It provides DataDepth<T>::value constant.
409
409
*/
410
- template <typename _Tp> class DataDepth {};
410
+ template <typename _Tp> class DataDepth { public: enum { value = - 1 , fmt = 0 }; };
411
411
412
412
template <> class DataDepth <bool > { public: enum { value = CV_8U, fmt=(int )' u' }; };
413
413
template <> class DataDepth <uchar> { public: enum { value = CV_8U, fmt=(int )' u' }; };
@@ -880,8 +880,10 @@ template<typename _Tp> class Rect_
880
880
881
881
882
882
typedef Point_<int > Point2i;
883
+ typedef Point_<int64> Point2l;
883
884
typedef Point2i Point;
884
885
typedef Size_<int > Size2i;
886
+ typedef Size_<int64> Size2l;
885
887
typedef Size_<double > Size2d;
886
888
typedef Size2i Size;
887
889
typedef Rect_<int > Rect;
@@ -2711,6 +2713,7 @@ CV_EXPORTS_W void polylines(InputOutputArray img, InputArrayOfArrays pts,
2711
2713
2712
2714
// ! clips the line segment by the rectangle Rect(0, 0, imgSize.width, imgSize.height)
2713
2715
CV_EXPORTS bool clipLine (Size imgSize, CV_IN_OUT Point& pt1, CV_IN_OUT Point& pt2);
2716
+ CV_EXPORTS bool clipLine (Size2l imgSize, CV_IN_OUT Point2l& pt1, CV_IN_OUT Point2l& pt2);
2714
2717
2715
2718
// ! clips the line segment by the rectangle imgRect
2716
2719
CV_EXPORTS_W bool clipLine (Rect imgRect, CV_OUT CV_IN_OUT Point& pt1, CV_OUT CV_IN_OUT Point& pt2);
@@ -2748,6 +2751,9 @@ class CV_EXPORTS LineIterator
2748
2751
CV_EXPORTS_W void ellipse2Poly ( Point center, Size axes, int angle,
2749
2752
int arcStart, int arcEnd, int delta,
2750
2753
CV_OUT vector<Point>& pts );
2754
+ CV_EXPORTS void ellipse2Poly ( Point2d center, Size2d axes, int angle,
2755
+ int arcStart, int arcEnd, int delta,
2756
+ CV_OUT vector<Point2d>& pts );
2751
2757
2752
2758
enum
2753
2759
{
0 commit comments