[pal] Use QgsGeometry::makeValid instead of buffer(0) to repair geometries

nyalldawson · nyalldawson · commit 23457336a0c3 · 2018-03-06T12:20:24.000+11:00
Possibly refs #14752 (cherry-picked from e05a5a9)
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2931,12 +2931,12 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen
   // fix invalid polygons
   if ( geom.type() == QgsWkbTypes::PolygonGeometry && !geom.isGeosValid() )
   {
-    QgsGeometry bufferGeom = geom.buffer( 0, 0 );
-    if ( bufferGeom.isNull() )
+    QgsGeometry validGeom = geom.makeValid();
+    if ( validGeom.isNull() )
     {
       return QgsGeometry();
     }
-    geom = bufferGeom;
+    geom = validGeom;
   }
 
   if ( !clipGeometry.isNull() &&

Original file line number	Diff line number	Diff line change
`@@ -2931,12 +2931,12 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen`
`2931`	`2931`	`// fix invalid polygons`
`2932`	`2932`	`if ( geom.type() == QgsWkbTypes::PolygonGeometry && !geom.isGeosValid() )`
`2933`	`2933`	`{`
`2934`		`- QgsGeometry bufferGeom = geom.buffer( 0, 0 );`
`2935`		`- if ( bufferGeom.isNull() )`
	`2934`	`+ QgsGeometry validGeom = geom.makeValid();`
	`2935`	`+ if ( validGeom.isNull() )`
`2936`	`2936`	`{`
`2937`	`2937`	`return QgsGeometry();`
`2938`	`2938`	`}`
`2939`		`- geom = bufferGeom;`
	`2939`	`+ geom = validGeom;`
`2940`	`2940`	`}`
`2941`	`2941`
`2942`	`2942`	`if ( !clipGeometry.isNull() &&`