Revert "[pal] Use QgsGeometry::makeValid instead of buffer(0) to repa…

…ir geometries" This reverts commit e05a5a9. The makeValid call is much slower than the previous "buffer( 0 )" approach Fixes #20260 (cherry picked from commit ff5a8bc)
qgis · Nov 10, 2018 · 62d0bae · 62d0bae
1 parent 2b4dc92
commit 62d0bae
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2976,13 +2976,13 @@ QgsGeometry QgsPalLabeling::prepareGeometry( const QgsGeometry &geometry, QgsRen
   // fix invalid polygons
   if ( geom.type() == QgsWkbTypes::PolygonGeometry && !geom.isGeosValid() )
   {
-    QgsGeometry validGeom = geom.makeValid();
-    if ( validGeom.isNull() )
+    QgsGeometry bufferGeom = geom.buffer( 0, 0 );
+    if ( bufferGeom.isNull() )
     {
-      QgsDebugMsg( QStringLiteral( "Could not repair geometry: %1" ).arg( validGeom.lastError() ) );
+      QgsDebugMsg( QStringLiteral( "Could not repair geometry: %1" ).arg( bufferGeom.lastError() ) );
       return QgsGeometry();
     }
-    geom = validGeom;
+    geom = bufferGeom;
   }
 
   if ( !clipGeometry.isNull() &&