mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update imgproc.hpp

Browse Source
This commit is contained in:
Suleyman TURKMEN 2018-11-05 02:16:07 +03:00
parent 687fa6a8ca
commit 182f43b6f9
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -4378,7 +4378,7 @@ CV_EXPORTS_W void drawMarker(InputOutputArray img, Point position, const Scalar&
/* ----------------------------------------------------------------------------------------- */ /* ----------------------------------------------------------------------------------------- */
/** @overload */ /** @overload */
CV_EXPORTS void fillConvexPoly(Mat& img, const Point* pts, int npts, CV_EXPORTS void fillConvexPoly(InputOutputArray img, const Point* pts, int npts,
const Scalar& color, int lineType = LINE_8, const Scalar& color, int lineType = LINE_8,
int shift = 0); int shift = 0);
@ -4400,7 +4400,7 @@ CV_EXPORTS_W void fillConvexPoly(InputOutputArray img, InputArray points,
int shift = 0); int shift = 0);
/** @overload */ /** @overload */
CV_EXPORTS void fillPoly(Mat& img, const Point** pts, CV_EXPORTS void fillPoly(InputOutputArray img, const Point** pts,
const int* npts, int ncontours, const int* npts, int ncontours,
const Scalar& color, int lineType = LINE_8, int shift = 0, const Scalar& color, int lineType = LINE_8, int shift = 0,
Point offset = Point() ); Point offset = Point() );
@ -4428,7 +4428,7 @@ CV_EXPORTS_W void fillPoly(InputOutputArray img, InputArrayOfArrays pts,
Point offset = Point() ); Point offset = Point() );
/** @overload */ /** @overload */
CV_EXPORTS void polylines(Mat& img, const Point* const* pts, const int* npts, CV_EXPORTS void polylines(InputOutputArray img, const Point* const* pts, const int* npts,
int ncontours, bool isClosed, const Scalar& color, int ncontours, bool isClosed, const Scalar& color,
int thickness = 1, int lineType = LINE_8, int shift = 0 ); int thickness = 1, int lineType = LINE_8, int shift = 0 );

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

@ -1971,11 +1971,13 @@ void ellipse(InputOutputArray _img, const RotatedRect& box, const Scalar& color,
EllipseEx( img, center, axes, _angle, 0, 360, buf, thickness, lineType ); EllipseEx( img, center, axes, _angle, 0, 360, buf, thickness, lineType );
} }
void fillConvexPoly( Mat& img, const Point* pts, int npts, void fillConvexPoly( InputOutputArray _img, const Point* pts, int npts,
const Scalar& color, int line_type, int shift ) const Scalar& color, int line_type, int shift )
{ {
CV_INSTRUMENT_REGION(); CV_INSTRUMENT_REGION();
Mat img = _img.getMat();
if( !pts || npts <= 0 ) if( !pts || npts <= 0 )
return; return;
@ -1989,13 +1991,14 @@ void fillConvexPoly( Mat& img, const Point* pts, int npts,
FillConvexPoly( img, _pts.data(), npts, buf, line_type, shift ); FillConvexPoly( img, _pts.data(), npts, buf, line_type, shift );
} }
void fillPoly( InputOutputArray _img, const Point** pts, const int* npts, int ncontours,
void fillPoly( Mat& img, const Point** pts, const int* npts, int ncontours,
const Scalar& color, int line_type, const Scalar& color, int line_type,
int shift, Point offset ) int shift, Point offset )
{ {
CV_INSTRUMENT_REGION(); CV_INSTRUMENT_REGION();
Mat img = _img.getMat();
if( line_type == CV_AA && img.depth() != CV_8U ) if( line_type == CV_AA && img.depth() != CV_8U )
line_type = 8; line_type = 8;
@ -2020,12 +2023,13 @@ void fillPoly( Mat& img, const Point** pts, const int* npts, int ncontours,
FillEdgeCollection(img, edges, buf); FillEdgeCollection(img, edges, buf);
} }
void polylines( InputOutputArray _img, const Point* const* pts, const int* npts, int ncontours, bool isClosed,
void polylines( Mat& img, const Point* const* pts, const int* npts, int ncontours, bool isClosed,
const Scalar& color, int thickness, int line_type, int shift ) const Scalar& color, int thickness, int line_type, int shift )
{ {
CV_INSTRUMENT_REGION(); CV_INSTRUMENT_REGION();
Mat img = _img.getMat();
if( line_type == CV_AA && img.depth() != CV_8U ) if( line_type == CV_AA && img.depth() != CV_8U )
line_type = 8; line_type = 8;
@ -2370,24 +2374,21 @@ double getFontScaleFromHeight(const int fontFace, const int pixelHeight, const i
} }
void cv::fillConvexPoly(InputOutputArray img, InputArray _points,
void cv::fillConvexPoly(InputOutputArray _img, InputArray _points,
const Scalar& color, int lineType, int shift) const Scalar& color, int lineType, int shift)
{ {
CV_INSTRUMENT_REGION(); CV_INSTRUMENT_REGION();
Mat img = _img.getMat(), points = _points.getMat(); Mat points = _points.getMat();
CV_Assert(points.checkVector(2, CV_32S) >= 0); CV_Assert(points.checkVector(2, CV_32S) >= 0);
fillConvexPoly(img, points.ptr<Point>(), points.rows*points.cols*points.channels()/2, color, lineType, shift); fillConvexPoly(img, points.ptr<Point>(), points.rows*points.cols*points.channels()/2, color, lineType, shift);
} }
void cv::fillPoly(InputOutputArray img, InputArrayOfArrays pts,
void cv::fillPoly(InputOutputArray _img, InputArrayOfArrays pts,
const Scalar& color, int lineType, int shift, Point offset) const Scalar& color, int lineType, int shift, Point offset)
{ {
CV_INSTRUMENT_REGION(); CV_INSTRUMENT_REGION();
Mat img = _img.getMat();
int i, ncontours = (int)pts.total(); int i, ncontours = (int)pts.total();
if( ncontours == 0 ) if( ncontours == 0 )
return; return;
@ -2406,14 +2407,12 @@ void cv::fillPoly(InputOutputArray _img, InputArrayOfArrays pts,
fillPoly(img, (const Point**)ptsptr, npts, (int)ncontours, color, lineType, shift, offset); fillPoly(img, (const Point**)ptsptr, npts, (int)ncontours, color, lineType, shift, offset);
} }
void cv::polylines(InputOutputArray img, InputArrayOfArrays pts,
void cv::polylines(InputOutputArray _img, InputArrayOfArrays pts,
bool isClosed, const Scalar& color, bool isClosed, const Scalar& color,
int thickness, int lineType, int shift ) int thickness, int lineType, int shift)
{ {
CV_INSTRUMENT_REGION(); CV_INSTRUMENT_REGION();
Mat img = _img.getMat();
bool manyContours = pts.kind() == _InputArray::STD_VECTOR_VECTOR || bool manyContours = pts.kind() == _InputArray::STD_VECTOR_VECTOR ||
pts.kind() == _InputArray::STD_VECTOR_MAT; pts.kind() == _InputArray::STD_VECTOR_MAT;
int i, ncontours = manyContours ? (int)pts.total() : 1; int i, ncontours = manyContours ? (int)pts.total() : 1;