pal labeling: do not try to register feature if GEOS geometry is empty

This removes the debug noise from GEOS when it tries to compute contains() predicate
qgis · Jun 11, 2014 · 699b8f3 · 699b8f3
1 parent f520f31
commit 699b8f3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1914,11 +1914,13 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
     }
   }
 
+  if ( !geom->asGeos() )
+    return;  // there is something really wrong with the geometry
+
   // fix invalid polygons
   if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )
   {
-    const GEOSGeometry* geos = geom->asGeos();
-    if ( geos ) geom->fromGeos( GEOSBuffer( geos, 0, 0 ) );
+    geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );
   }
 
   // CLIP the geometry if it is bigger than the extent