Filter invalid rings during label geometry preparation

qgis · May 29, 2018 · 6c0a1da07678a39d544f1ae1eb1d1eb9018a155c · 6c0a1da
1 parent 2a70c4b
commit 6c0a1da07678a39d544f1ae1eb1d1eb9018a155c
Unified Split

Showing with 3 additions and 0 deletions.

+3 −0 src/core/qgspallabeling.cpp
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