Merge pull request #7959 from alalek:fix_7957

8 years ago · 45f0cf0d41
parent 9be630466f fa36b9d345
commit 45f0cf0d41
1 changed files with 6 additions and 0 deletions
--- a/modules/imgproc/src/drawing.cpp
+++ b/modules/imgproc/src/drawing.cpp
@ -1171,6 +1171,9 @@ FillConvexPoly( Mat& img, const Point2l* v, int npts, const void* color, int lin
    edge[0].di = 1;
    edge[1].di = npts - 1;

+    edge[0].x = edge[1].x = -XY_ONE;
+    edge[0].dx = edge[1].dx = 0;
+
    ptr += img.step*y;

    do
@ -1213,6 +1216,9 @@ FillConvexPoly( Mat& img, const Point2l* v, int npts, const void* color, int lin
            }
        }

+        if (edges < 0)
+            break;
+
        if (y >= 0)
        {
            int left = 0, right = 1;