qgis · Sep 22, 2017
diff --git a/‎src/core/geometry/qgscurvepolygon.cpp
Lines changed: 4 additions & 4 deletions b/‎src/core/geometry/qgscurvepolygon.cpp
Lines changed: 4 additions & 4 deletions
diff --git a/‎tests/src/core/testqgsgeometry.cpp
Lines changed: 1468 additions & 305 deletions b/‎tests/src/core/testqgsgeometry.cpp
Lines changed: 1468 additions & 305 deletions
diff --git a/‎tests/src/python/test_qgsgeometry.py
Lines changed: 14 additions & 1 deletion b/‎tests/src/python/test_qgsgeometry.py
Lines changed: 14 additions & 1 deletion
diff --git a/‎tests/testdata/control_images/geometry/expected_compoundcurve/expected_compoundcurve.png
597 Bytes b/‎tests/testdata/control_images/geometry/expected_compoundcurve/expected_compoundcurve.png
597 Bytes
diff --git a/‎tests/testdata/control_images/geometry/expected_compoundcurve_aspolygon/expected_compoundcurve_aspolygon.png
541 Bytes b/‎tests/testdata/control_images/geometry/expected_compoundcurve_aspolygon/expected_compoundcurve_aspolygon.png
541 Bytes
diff --git a/‎tests/testdata/control_images/geometry/expected_curvepolygon_circularstring/expected_curvepolygon_circularstring.png
582 Bytes b/‎tests/testdata/control_images/geometry/expected_curvepolygon_circularstring/expected_curvepolygon_circularstring.png
582 Bytes
diff --git a/‎tests/testdata/control_images/geometry/expected_curvepolygon_circularstring_interiorrings/expected_curvepolygon_circularstring_interiorrings.png
643 Bytes b/‎tests/testdata/control_images/geometry/expected_curvepolygon_circularstring_interiorrings/expected_curvepolygon_circularstring_interiorrings.png
643 Bytes
@@ -626,12 +626,12 @@ void QgsCurvePolygon::removeInteriorRings( double minimumAllowedArea )
 
 void QgsCurvePolygon::draw( QPainter &p ) const
 {
+  if ( !mExteriorRing )
+    return;
+
   if ( mInteriorRings.empty() )
   {
-    if ( mExteriorRing )
-    {
-      mExteriorRing->drawAsPolygon( p );
-    }
+    mExteriorRing->drawAsPolygon( p );
   }
   else
   {
 
@@ -4304,7 +4304,20 @@ def testGeometryDraw(self):
                   'wkt': 'CircularString (20 30, 50 30, 50 90)',
                   'reference_image': 'circularstring',
                   'as_polygon_reference_image': 'circularstring_aspolygon',
-                  'use_pen': True}
+                  'use_pen': True},
+                 {'name': 'CurvePolygon',
+                  'wkt': 'CurvePolygon(CircularString (20 30, 50 30, 50 90, 10 50, 20 30))',
+                  'reference_image': 'curvepolygon_circularstring',
+                  'use_pen': False},
+                 {'name': 'CurvePolygonInteriorRings',
+                  'wkt': 'CurvePolygon(CircularString (20 30, 50 30, 50 90, 10 50, 20 30),LineString(30 45, 55 45, 30 75, 30 45))',
+                  'reference_image': 'curvepolygon_circularstring_interiorrings',
+                  'use_pen': False},
+                 {'name': 'CompoundCurve',
+                  'wkt': 'CompoundCurve(CircularString (20 30, 50 30, 50 90),LineString(50 90, 10 90))',
+                  'reference_image': 'compoundcurve',
+                  'use_pen': True,
+                  'as_polygon_reference_image': 'compoundcurve_aspolygon', }
                  ]
 
         for test in tests:
Original file line number	Diff line number	Diff line change
`@@ -626,12 +626,12 @@ void QgsCurvePolygon::removeInteriorRings( double minimumAllowedArea )`
`626`	`626`
`627`	`627`	`void QgsCurvePolygon::draw( QPainter &p ) const`
`628`	`628`	`{`
	`629`	`+ if ( !mExteriorRing )`
	`630`	`+ return;`
	`631`	`+`
`629`	`632`	`if ( mInteriorRings.empty() )`
`630`	`633`	`{`
`631`		`- if ( mExteriorRing )`
`632`		`- {`
`633`		`- mExteriorRing->drawAsPolygon( p );`
`634`		`- }`
	`634`	`+ mExteriorRing->drawAsPolygon( p );`
`635`	`635`	`}`
`636`	`636`	`else`
`637`	`637`	`{`