Filter invalid rings during label geometry preparation

nyalldawson · nyalldawson · commit 6c0a1da07678 · 2018-05-30T05:01:40.000+10:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -58,6 +58,7 @@
 #include "qgsproperty.h"
 #include "qgssymbollayerutils.h"
 #include "qgsmaptopixelgeometrysimplifier.h"
+#include "qgscurvepolygon.h"
 #include <QMessageBox>
 
 
@@ -2904,6 +2905,8 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen
     {
       return std::isfinite( point.x() ) && std::isfinite( point.y() );
     } );
+    if ( QgsCurvePolygon *cp = qgsgeometry_cast< QgsCurvePolygon * >( geom.get() ) )
+      cp->removeInvalidRings();
   }
 
   // Rotate the geometry if needed, before clipping

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`#include "qgsproperty.h"`
`59`	`59`	`#include "qgssymbollayerutils.h"`
`60`	`60`	`#include "qgsmaptopixelgeometrysimplifier.h"`
	`61`	`+#include "qgscurvepolygon.h"`
`61`	`62`	`#include <QMessageBox>`
`62`	`63`
`63`	`64`
`@@ -2904,6 +2905,8 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen`
`2904`	`2905`	`{`
`2905`	`2906`	`return std::isfinite( point.x() ) && std::isfinite( point.y() );`
`2906`	`2907`	`} );`
	`2908`	`+ if ( QgsCurvePolygon cp = qgsgeometry_cast< QgsCurvePolygon >( geom.get() ) )`
	`2909`	`+ cp->removeInvalidRings();`
`2907`	`2910`	`}`
`2908`	`2911`
`2909`	`2912`	`// Rotate the geometry if needed, before clipping`