Merge pull request #681 from jbohren-forks:fix-ellipse-segfault

219bdb98 · Vadim Pisarevsky · OpenCV Buildbot · 87563c66 · a7a0f92e · 219bdb98
Commit 219bdb98 authored Mar 21, 2013 by Vadim Pisarevsky Committed by OpenCV Buildbot Mar 21, 2013
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

drawing.cpp modules/core/src/drawing.cpp +4 -2

No files found.
--- a/modules/core/src/drawing.cpp
+++ b/modules/core/src/drawing.cpp
@@ -890,8 +890,10 @@ void ellipse2Poly( Point center, Size axes, int angle,
            pts.push_back(pt);
    }

-    if( pts.size() < 2 )
-        pts.push_back(pts[0]);
+    // If there are no points, it's a zero-size polygon
+    if( pts.size() < 2) {
+        pts.assign(2,center);
+    }
 }