Merge pull request #27599 from chacha21:drawing_stack_alloc

chacha21 · web-flow · commit e31ff001042e · 2025-08-07T17:19:55.000+03:00
optimize some drawing with stack allocation #27599 Some drawings can try a stack allocation instead of a std::vector ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [X] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
diff --git a/modules/imgproc/src/drawing.cpp b/modules/imgproc/src/drawing.cpp
@@ -2034,9 +2034,12 @@ void fillPoly( InputOutputArray _img, const Point** pts, const int* npts, int nc
     edges.reserve( total + 1 );
     for (i = 0; i < ncontours; i++)
     {
-        if (npts[i] > 0 && pts[i])
+        const Point* currentContour = pts[i];
+        const int currentContourLength = npts[i];
+        if ( (currentContourLength > 0) && currentContour )
         {
-            std::vector<Point2l> _pts(pts[i], pts[i] + npts[i]);
+            AutoBuffer<Point2l> _pts(currentContourLength);
+            std::copy(currentContour, currentContour+currentContourLength, _pts.data());
             CollectPolyEdges(img, _pts.data(), npts[i], edges, buf, line_type, shift, offset);
         }
     }
@@ -2063,8 +2066,11 @@ void polylines( InputOutputArray _img, const Point* const* pts, const int* npts,
 
     for( int i = 0; i < ncontours; i++ )
     {
-        std::vector<Point2l> _pts(pts[i], pts[i]+npts[i]);
-        PolyLine( img, _pts.data(), npts[i], isClosed, buf, thickness, line_type, shift );
+        const Point* currentContour = pts[i];
+        const int currentContourLength = npts[i];
+        AutoBuffer<Point2l> _pts(currentContourLength);
+        std::copy(currentContour, currentContour+currentContourLength, _pts.data());
+        PolyLine( img, _pts.data(), currentContourLength, isClosed, buf, thickness, line_type, shift );
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2034,9 +2034,12 @@ void fillPoly( InputOutputArray _img, const Point** pts, const int* npts, int nc`
`2034`	`2034`	`edges.reserve( total + 1 );`
`2035`	`2035`	`for (i = 0; i < ncontours; i++)`
`2036`	`2036`	`{`
`2037`		`- if (npts[i] > 0 && pts[i])`
	`2037`	`+ const Point* currentContour = pts[i];`
	`2038`	`+ const int currentContourLength = npts[i];`
	`2039`	`+ if ( (currentContourLength > 0) && currentContour )`
`2038`	`2040`	`{`
`2039`		`- std::vector<Point2l> _pts(pts[i], pts[i] + npts[i]);`
	`2041`	`+ AutoBuffer<Point2l> _pts(currentContourLength);`
	`2042`	`+ std::copy(currentContour, currentContour+currentContourLength, _pts.data());`
`2040`	`2043`	`CollectPolyEdges(img, _pts.data(), npts[i], edges, buf, line_type, shift, offset);`
`2041`	`2044`	`}`
`2042`	`2045`	`}`
`@@ -2063,8 +2066,11 @@ void polylines( InputOutputArray _img, const Point* const* pts, const int* npts,`
`2063`	`2066`
`2064`	`2067`	`for( int i = 0; i < ncontours; i++ )`
`2065`	`2068`	`{`
`2066`		`- std::vector<Point2l> _pts(pts[i], pts[i]+npts[i]);`
`2067`		`- PolyLine( img, _pts.data(), npts[i], isClosed, buf, thickness, line_type, shift );`
	`2069`	`+ const Point* currentContour = pts[i];`
	`2070`	`+ const int currentContourLength = npts[i];`
	`2071`	`+ AutoBuffer<Point2l> _pts(currentContourLength);`
	`2072`	`+ std::copy(currentContour, currentContour+currentContourLength, _pts.data());`
	`2073`	`+ PolyLine( img, _pts.data(), currentContourLength, isClosed, buf, thickness, line_type, shift );`
`2068`	`2074`	`}`
`2069`	`2075`	`}`
`2070`	`2076`