Merge pull request #1429 from christianurich/QgsDatumTransformStore_t…

…ransformation_0 Fix crash when QgsDatumTransformStore::transformation returns 0
qgis · Jun 6, 2014 · 63af881 · 63af881
2 parents 563f521 + 319694f
commit 63af881
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp
@@ -409,7 +409,8 @@ void QgsMapRendererJob::drawOldLabeling( const QgsMapSettings& settings, QgsRend
     if ( settings.hasCrsTransformEnabled() )
     {
       ct = settings.layerTransfrom( ml );
-      reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 );
+      if ( ct )
+         reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 );
     }
 
     renderContext.setCoordinateTransform( ct );
@@ -572,7 +573,10 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin
     if ( mSettings.hasCrsTransformEnabled() )
     {
       ct = mSettings.layerTransfrom( ml );
-      reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 );
+      if ( ct )
+      {
+        reprojectToLayerExtent( ct, ml->crs().geographicFlag(), r1, r2 );
+      }
       QgsDebugMsg( "extent: " + r1.toString() );
       if ( !r1.isFinite() || !r2.isFinite() )
       {