generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drawing

Browse Source
This commit is contained in:
Konstantin Matskevich
2014-02-04 11:09:29 +04:00
parent 92c8b94ba9
commit c684da3549
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/core/src/drawing.cpp
View File

@@ -1568,9 +1568,11 @@ PolyLine( Mat& img, const Point* v, int count, bool is_closed,
* External functions *
\****************************************************************************************/
void line( Mat& img, Point pt1, Point pt2, const Scalar& color,
void line( InputOutputArray _img, Point pt1, Point pt2, const Scalar& color,
int thickness, int line_type, int shift )
{
Mat img = _img.getMat();
if( line_type == CV_AA && img.depth() != CV_8U )
line_type = 8;
@@ -1582,10 +1584,12 @@ void line( Mat& img, Point pt1, Point pt2, const Scalar& color,
ThickLine( img, pt1, pt2, buf, thickness, line_type, 3, shift );
}
void rectangle( Mat& img, Point pt1, Point pt2,
void rectangle( InputOutputArray _img, Point pt1, Point pt2,
const Scalar& color, int thickness,
int lineType, int shift )
{
Mat img = _img.getMat();
if( lineType == CV_AA && img.depth() != CV_8U )
lineType = 8;
@@ -1622,9 +1626,11 @@ void rectangle( Mat& img, Rect rec,
}
void circle( Mat& img, Point center, int radius,
void circle( InputOutputArray _img, Point center, int radius,
const Scalar& color, int thickness, int line_type, int shift )
{
Mat img = _img.getMat();
if( line_type == CV_AA && img.depth() != CV_8U )
line_type = 8;
@@ -1647,10 +1653,12 @@ void circle( Mat& img, Point center, int radius,
}
void ellipse( Mat& img, Point center, Size axes,
void ellipse( InputOutputArray _img, Point center, Size axes,
double angle, double start_angle, double end_angle,
const Scalar& color, int thickness, int line_type, int shift )
{
Mat img = _img.getMat();
if( line_type == CV_AA && img.depth() != CV_8U )
line_type = 8;
@@ -1672,9 +1680,11 @@ void ellipse( Mat& img, Point center, Size axes,
_end_angle, buf, thickness, line_type );
}
void ellipse(Mat& img, const RotatedRect& box, const Scalar& color,
void ellipse(InputOutputArray _img, const RotatedRect& box, const Scalar& color,
int thickness, int lineType)
{
Mat img = _img.getMat();
if( lineType == CV_AA && img.depth() != CV_8U )
lineType = 8;
@@ -1918,11 +1928,12 @@ static const int* getFontData(int fontFace)
}
void putText( Mat& img, const String& text, Point org,
void putText( InputOutputArray _img, const String& text, Point org,
int fontFace, double fontScale, Scalar color,
int thickness, int line_type, bool bottomLeftOrigin )
{
Mat img = _img.getMat();
const int* ascii = getFontData(fontFace);
double buf[4];