Merge pull request #25996 from asmorkalov:as/fillPoly_check

asmorkalov · web-flow · commit d8bcc2c85d63 · 2024-08-06T17:56:22.000+03:00
Fixed asserts in fillPoly
diff --git a/modules/imgproc/misc/python/test/test_imgproc.py b/modules/imgproc/misc/python/test/test_imgproc.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+import numpy as np
+import cv2 as cv
+
+from tests_common import NewOpenCVTests
+
+class Imgproc_Tests(NewOpenCVTests):
+
+    def test_python_986(self):
+        cntls = []
+        img = np.zeros((100,100,3), dtype=np.uint8)
+        color = (0,0,0)
+        cnts = np.array(cntls, dtype=np.int32).reshape((1, -1, 2))
+        try:
+            cv.fillPoly(img, cnts, color)
+            assert False
+        except:
+            assert True
diff --git a/modules/imgproc/src/drawing.cpp b/modules/imgproc/src/drawing.cpp
@@ -2044,8 +2044,11 @@ void fillPoly( InputOutputArray _img, const Point** pts, const int* npts, int nc
     edges.reserve( total + 1 );
     for (i = 0; i < ncontours; i++)
     {
-        std::vector<Point2l> _pts(pts[i], pts[i] + npts[i]);
-        CollectPolyEdges(img, _pts.data(), npts[i], edges, buf, line_type, shift, offset);
+        if (npts[i] > 0 && pts[i])
+        {
+            std::vector<Point2l> _pts(pts[i], pts[i] + npts[i]);
+            CollectPolyEdges(img, _pts.data(), npts[i], edges, buf, line_type, shift, offset);
+        }
     }
 
     FillEdgeCollection(img, edges, buf, line_type);
@@ -2430,7 +2433,7 @@ void cv::fillPoly(InputOutputArray img, InputArrayOfArrays pts,
     for( i = 0; i < ncontours; i++ )
     {
         Mat p = pts.getMat(manyContours ? i : -1);
-        CV_Assert(p.checkVector(2, CV_32S) >= 0);
+        CV_Assert(p.checkVector(2, CV_32S) > 0);
         ptsptr[i] = p.ptr<Point>();
         npts[i] = p.rows*p.cols*p.channels()/2;
     }

Original file line number	Diff line number	Diff line change
`@@ -2044,8 +2044,11 @@ void fillPoly( InputOutputArray _img, const Point** pts, const int* npts, int nc`
`2044`	`2044`	`edges.reserve( total + 1 );`
`2045`	`2045`	`for (i = 0; i < ncontours; i++)`
`2046`	`2046`	`{`
`2047`		`- std::vector<Point2l> _pts(pts[i], pts[i] + npts[i]);`
`2048`		`- CollectPolyEdges(img, _pts.data(), npts[i], edges, buf, line_type, shift, offset);`
	`2047`	`+ if (npts[i] > 0 && pts[i])`
	`2048`	`+ {`
	`2049`	`+ std::vector<Point2l> _pts(pts[i], pts[i] + npts[i]);`
	`2050`	`+ CollectPolyEdges(img, _pts.data(), npts[i], edges, buf, line_type, shift, offset);`
	`2051`	`+ }`
`2049`	`2052`	`}`
`2050`	`2053`
`2051`	`2054`	`FillEdgeCollection(img, edges, buf, line_type);`
`@@ -2430,7 +2433,7 @@ void cv::fillPoly(InputOutputArray img, InputArrayOfArrays pts,`
`2430`	`2433`	`for( i = 0; i < ncontours; i++ )`
`2431`	`2434`	`{`
`2432`	`2435`	`Mat p = pts.getMat(manyContours ? i : -1);`
`2433`		`- CV_Assert(p.checkVector(2, CV_32S) >= 0);`
	`2436`	`+ CV_Assert(p.checkVector(2, CV_32S) > 0);`
`2434`	`2437`	`ptsptr[i] = p.ptr<Point>();`
`2435`	`2438`	`npts[i] = p.rowsp.colsp.channels()/2;`
`2436`	`2439`	`}`