#10433: Fix simplification of invalid and empty multipolygons

ahuarte47 · ahuarte47 · commit 7e0ef8f93a2a · 2014-06-11T02:01:20.000+02:00
diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp
@@ -247,10 +247,17 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry( int simplifyFlags, QGis::WkbT
     // Fix the topology of the geometry
     if ( numTargetPoints <= ( isaLinearRing ? 2 : 1 ) )
     {
+      unsigned char* targetTempWkb = targetWkb;
+      int targetWkbTempSize = targetWkbSize;
+
       sourceWkb = sourcePrevWkb;
       targetWkb = targetPrevWkb;
       targetWkbSize = targetWkbPrevSize;
-      return generalizeWkbGeometry( wkbType, sourceWkb, sourceWkbSize, targetWkb, targetWkbSize, QgsRectangle( xmin, ymin, xmax, ymax ), writeHeader );
+      bool isok = generalizeWkbGeometry( wkbType, sourceWkb, sourceWkbSize, targetWkb, targetWkbSize, QgsRectangle( xmin, ymin, xmax, ymax ), writeHeader );
+      if ( isok ) return true;
+
+      targetWkb = targetTempWkb;
+      targetWkbSize = targetWkbTempSize;
     }
     if ( isaLinearRing )
     {
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1917,7 +1917,8 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   // fix invalid polygons
   if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )
   {
-    geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );
+    const GEOSGeometry* geos = geom->asGeos();
+    if ( geos ) geom->fromGeos( GEOSBuffer( geos, 0, 0 ) );
   }
 
   // CLIP the geometry if it is bigger than the extent

Original file line number	Diff line number	Diff line change
`@@ -247,10 +247,17 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry( int simplifyFlags, QGis::WkbT`
`247`	`247`	`// Fix the topology of the geometry`
`248`	`248`	`if ( numTargetPoints <= ( isaLinearRing ? 2 : 1 ) )`
`249`	`249`	`{`
	`250`	`+ unsigned char* targetTempWkb = targetWkb;`
	`251`	`+ int targetWkbTempSize = targetWkbSize;`
	`252`	`+`
`250`	`253`	`sourceWkb = sourcePrevWkb;`
`251`	`254`	`targetWkb = targetPrevWkb;`
`252`	`255`	`targetWkbSize = targetWkbPrevSize;`
`253`		`- return generalizeWkbGeometry( wkbType, sourceWkb, sourceWkbSize, targetWkb, targetWkbSize, QgsRectangle( xmin, ymin, xmax, ymax ), writeHeader );`
	`256`	`+ bool isok = generalizeWkbGeometry( wkbType, sourceWkb, sourceWkbSize, targetWkb, targetWkbSize, QgsRectangle( xmin, ymin, xmax, ymax ), writeHeader );`
	`257`	`+ if ( isok ) return true;`
	`258`	`+`
	`259`	`+ targetWkb = targetTempWkb;`
	`260`	`+ targetWkbSize = targetWkbTempSize;`
`254`	`261`	`}`
`255`	`262`	`if ( isaLinearRing )`
`256`	`263`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1917,7 +1917,8 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`1917`	`1917`	`// fix invalid polygons`
`1918`	`1918`	`if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )`
`1919`	`1919`	`{`
`1920`		`- geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );`
	`1920`	`+ const GEOSGeometry* geos = geom->asGeos();`
	`1921`	`+ if ( geos ) geom->fromGeos( GEOSBuffer( geos, 0, 0 ) );`
`1921`	`1922`	`}`
`1922`	`1923`
`1923`	`1924`	`// CLIP the geometry if it is bigger than the extent`