Inverted polygons: avoid inplace geometry transformation

Hugo Mercier · Hugo Mercier · commit 5ec4fef13a17 · 2014-06-10T14:38:27.000+02:00
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
@@ -183,11 +183,11 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
 
   // update the geometry
   CombinedFeature& cFeat = mFeaturesCategories[ mSymbolCategories[catId] ];
-  QgsGeometry* geom = feature.geometry();
-  if ( !geom )
+  if ( !feature.geometry() )
   {
     return false;
   }
+  QScopedPointer<QgsGeometry> geom( new QgsGeometry( *feature.geometry() ) );
 
   const QgsCoordinateTransform* xform = context.coordinateTransform();
   if ( xform )
@@ -206,7 +206,7 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
     else
     {
       // other features: combine them (union)
-      QgsGeometry* combined = cFeat.feature.geometry()->combine( geom );
+      QgsGeometry* combined = cFeat.feature.geometry()->combine( geom.data() );
       if ( combined && combined->isGeosValid() )
       {
         cFeat.feature.setGeometry( combined );

Original file line number	Diff line number	Diff line change
`@@ -183,11 +183,11 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo`
`183`	`183`
`184`	`184`	`// update the geometry`
`185`	`185`	`CombinedFeature& cFeat = mFeaturesCategories[ mSymbolCategories[catId] ];`
`186`		`- QgsGeometry* geom = feature.geometry();`
`187`		`- if ( !geom )`
	`186`	`+ if ( !feature.geometry() )`
`188`	`187`	`{`
`189`	`188`	`return false;`
`190`	`189`	`}`
	`190`	`+ QScopedPointer<QgsGeometry> geom( new QgsGeometry( *feature.geometry() ) );`
`191`	`191`
`192`	`192`	`const QgsCoordinateTransform* xform = context.coordinateTransform();`
`193`	`193`	`if ( xform )`
`@@ -206,7 +206,7 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo`
`206`	`206`	`else`
`207`	`207`	`{`
`208`	`208`	`// other features: combine them (union)`
`209`		`- QgsGeometry* combined = cFeat.feature.geometry()->combine( geom );`
	`209`	`+ QgsGeometry* combined = cFeat.feature.geometry()->combine( geom.data() );`
`210`	`210`	`if ( combined && combined->isGeosValid() )`
`211`	`211`	`{`
`212`	`212`	`cFeat.feature.setGeometry( combined );`