no modify original geometry

qgis · Jun 13, 2014 · dfa03e8 · dfa03e8
1 parent 10e7758
commit dfa03e8
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1928,15 +1928,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )
   {
     QgsGeometry* bufferGeom = geom->buffer( 0, 0 );
-
-    if ( bufferGeom )
+    if ( !bufferGeom )
     {
-      size_t wkbSize = bufferGeom->wkbSize();
-      unsigned char* wkb = ( unsigned char* )malloc( wkbSize );
-      memcpy( wkb, bufferGeom->asWkb(), wkbSize );
-      geom->fromWkb( wkb, wkbSize );
-      delete bufferGeom;
+      return;
     }
+    geom = bufferGeom;
+    clonedGeometry.reset( geom );
   }
 
   // CLIP the geometry if it is bigger than the extent