potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Partially backport C API removal in imgproc module to reduce conflicts with 5.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-02-29 12:24:01 +03:00
parent 5e5a035c5b
commit fc98b31c3e
13 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/drawing.cpp
+2 -2
View File
@@ -1359,7 +1359,7 @@ FillEdgeCollection( Mat& img, std::vector<PolyEdge>& edges, const void* color, i
int pix_size = (int)img.elemSize();
int delta;
if (line_type < CV_AA)
if (line_type < cv::LINE_AA)
delta = 0;
else
delta = XY_ONE - 1;
@@ -2310,7 +2310,7 @@ void putText( InputOutputArray _img, const String& text, Point org,
int base_line = -(ascii[0] & 15);
int hscale = cvRound(fontScale*XY_ONE), vscale = hscale;
if( line_type == CV_AA && img.depth() != CV_8U )
if( line_type == cv::LINE_AA && img.depth() != CV_8U )
line_type = 8;
if( bottomLeftOrigin )