[QGIS Commit] r14068 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-08-11 22:20:33 +0000 (Wed, 11 Aug 2010)
New Revision: 14068

Modified:
   trunk/qgis/src/core/qgspallabeling.cpp
Log:
fix r14018 (reenable pal label reprojection)

Modified: trunk/qgis/src/core/qgspallabeling.cpp
===================================================================
--- trunk/qgis/src/core/qgspallabeling.cpp	2010-08-11 21:30:58 UTC (rev 14067)
+++ trunk/qgis/src/core/qgspallabeling.cpp	2010-08-11 22:20:33 UTC (rev 14068)
@@ -44,6 +44,7 @@
 #include <qgsvectordataprovider.h>
 #include <qgsgeometry.h>
 #include <qgsmaprenderer.h>
+#include "qgslogger.h"
 
 
 using namespace pal;
@@ -416,13 +417,14 @@
   }
 
   QgsGeometry* geom = f.geometry();
+
+  if ( ct ) // reproject the geometry if necessary
+    geom->transform( *ct );
+
   GEOSGeometry* geos_geom = geom->asGeos();
   if ( geos_geom == NULL )
     return; // invalid geometry
 
-  if ( ct != NULL ) // reproject the geometry if necessary
-    geom->transform( *ct );
-
   if ( !checkMinimumSizeMM( context, geom, minFeatureSize ) )
   {
     return;
@@ -858,9 +860,7 @@
     drawLabelCandidateRect( lp->getNextPart(), painter, xform );
 }
 
-#include "qgslogger.h"
-
-void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QPainter* painter, const QFont& f, const QColor& c, const QgsMapToPixel* xform, double bufferSize, \
+void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QPainter* painter, const QFont& f, const QColor& c, const QgsMapToPixel* xform, double bufferSize,
                                 const QColor& bufferColor, bool drawBuffer )
 {
   QgsPoint outPt = xform->transform( label->getX(), label->getY() );