#8725-R: no check geometry pointer twice

ahuarte47 · m-kuhn · commit 61c8cad64834 · 2014-01-15T11:00:01.000+01:00
diff --git a/src/core/qgsfeatureiterator.cpp b/src/core/qgsfeatureiterator.cpp
@@ -113,11 +113,8 @@ bool QgsAbstractFeatureIterator::simplify( QgsFeature& feature )
   {
     QgsGeometry* geometry = feature.geometry();
 
-    if ( geometry ) 
-    {
-      QGis::GeometryType geometryType = geometry->type();
-      if ( geometryType == QGis::Line || geometryType == QGis::Polygon ) return mGeometrySimplifier->simplifyGeometry( geometry );
-    }
+    QGis::GeometryType geometryType = geometry->type();
+    if ( geometryType == QGis::Line || geometryType == QGis::Polygon ) return mGeometrySimplifier->simplifyGeometry( geometry );
   }
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,8 @@ bool QgsAbstractFeatureIterator::simplify( QgsFeature& feature )`
`113`	`113`	`{`
`114`	`114`	`QgsGeometry* geometry = feature.geometry();`
`115`	`115`
`116`		`- if ( geometry )`
`117`		`- {`
`118`		`- QGis::GeometryType geometryType = geometry->type();`
`119`		`- if ( geometryType == QGis::Line \|\| geometryType == QGis::Polygon ) return mGeometrySimplifier->simplifyGeometry( geometry );`
`120`		`- }`
	`116`	`+ QGis::GeometryType geometryType = geometry->type();`
	`117`	`+ if ( geometryType == QGis::Line \|\| geometryType == QGis::Polygon ) return mGeometrySimplifier->simplifyGeometry( geometry );`
`121`	`118`	`}`
`122`	`119`	`return false;`
`123`	`120`	`}`