catch transformation exceptions in pal labeling (fixes #7730)

qgis · Jul 19, 2013 · 6831498 · 6831498
1 parent 5ab0df5
commit 6831498
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1771,7 +1771,17 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
   }
 
   if ( ct ) // reproject the geometry if necessary
-    geom->transform( *ct );
+  {
+    try
+    {
+      geom->transform( *ct );
+    }
+    catch ( QgsCsException &cse )
+    {
+      QgsDebugMsgLevel( QString( "Ignoring feature %1 due transformation exception" ).arg( f.id() ), 4 );
+      return;
+    }
+  }
 
   if ( !checkMinimumSizeMM( context, geom, minFeatureSize ) )
   {
@@ -2069,7 +2079,15 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
         double z = 0;
         if ( ct )
         {
-          ct->transformInPlace( xPos, yPos, z );
+          try
+          {
+            ct->transformInPlace( xPos, yPos, z );
+          }
+          catch ( QgsCsException &e )
+          {
+            QgsDebugMsgLevel( QString( "Ignoring feature %1 due transformation exception on data-defined position" ).arg( f.id() ), 4 );
+            return;
+          }
         }
 
         xPos += xdiff;