diff --git a/modules/imgproc/src/drawing.cpp b/modules/imgproc/src/drawing.cpp
index d0368cfa95..e3158750c5 100644
--- 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 );
     }
 }