#9655: check geometry polygon better

ahuarte47 · ahuarte47 · commit 04f702408eff · 2014-03-06T08:57:50.000+01:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1841,7 +1841,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   }
 
   // fix invalid polygons
-  if ( QGis::singleType( QGis::flatType( geom->wkbType() ) ) == QGis::WKBPolygon && !geom->isGeosValid() )
+  if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )
   {
     geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );
   }

Original file line number	Diff line number	Diff line change
`@@ -1841,7 +1841,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`1841`	`1841`	`}`
`1842`	`1842`
`1843`	`1843`	`// fix invalid polygons`
`1844`		`- if ( QGis::singleType( QGis::flatType( geom->wkbType() ) ) == QGis::WKBPolygon && !geom->isGeosValid() )`
	`1844`	`+ if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )`
`1845`	`1845`	`{`
`1846`	`1846`	`geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );`
`1847`	`1847`	`}`