potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Clean up C API

Browse Source
This commit is contained in:
Suleyman TURKMEN
2021-03-03 00:26:50 +03:00
parent 178240ccf1
commit 703dea4817
23 changed files with 0 additions and 2351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/drawing.cpp
-46
View File
@@ -2346,24 +2346,6 @@ cvDrawContours( void* _img, CvSeq* contour,
contour0->h_next = h_next;
}
CV_IMPL int
cvClipLine( CvSize size, CvPoint* pt1, CvPoint* pt2 )
{
CV_Assert( pt1 && pt2 );
return cv::clipLine( size, *(cv::Point*)pt1, *(cv::Point*)pt2 );
}
CV_IMPL int
cvEllipse2Poly( CvPoint center, CvSize axes, int angle,
int arc_start, int arc_end, CvPoint* _pts, int delta )
{
std::vector<cv::Point> pts;
cv::ellipse2Poly( Point(center), Size(axes), angle, arc_start, arc_end, delta, pts );
memcpy( _pts, &pts[0], pts.size()*sizeof(_pts[0]) );
return (int)pts.size();
}
CV_IMPL CvScalar
cvColorToScalar( double packed_color, int type )
{
@@ -2463,15 +2445,6 @@ cvRectangle( CvArr* _img, CvPoint pt1, CvPoint pt2,
cv::rectangle( img, pt1, pt2, color, thickness, line_type, shift );
}
CV_IMPL void
cvRectangleR( CvArr* _img, CvRect rec,
CvScalar color, int thickness,
int line_type, int shift )
{
cv::Mat img = cv::cvarrToMat(_img);
cv::rectangle( img, rec, color, thickness, line_type, shift );
}
CV_IMPL void
cvCircle( CvArr* _img, CvPoint center, int radius,
CvScalar color, int thickness, int line_type, int shift )
@@ -2490,15 +2463,6 @@ cvEllipse( CvArr* _img, CvPoint center, CvSize axes,
color, thickness, line_type, shift );
}
CV_IMPL void
cvFillConvexPoly( CvArr* _img, const CvPoint *pts, int npts,
CvScalar color, int line_type, int shift )
{
cv::Mat img = cv::cvarrToMat(_img);
cv::fillConvexPoly( img, (const cv::Point*)pts, npts,
color, line_type, shift );
}
CV_IMPL void
cvFillPoly( CvArr* _img, CvPoint **pts, const int *npts, int ncontours,
CvScalar color, int line_type, int shift )
@@ -2546,14 +2510,4 @@ cvInitFont( CvFont *font, int font_face, double hscale, double vscale,
font->line_type = line_type;
}
CV_IMPL void
cvGetTextSize( const char *text, const CvFont *_font, CvSize *_size, int *_base_line )
{
CV_Assert(text != 0 && _font != 0);
cv::Size size = cv::getTextSize( text, _font->font_face, (_font->hscale + _font->vscale)*0.5,
_font->thickness, _base_line );
if( _size )
*_size = cvSize(size);
}
/* End of file. */