[processing] Fix invalid geometries made by densify when input geom is null

nyalldawson · nyalldawson · commit eefa7115bf2f · 2016-11-07T09:22:50.000+10:00
diff --git a/python/plugins/processing/algs/qgis/DensifyGeometries.py b/python/plugins/processing/algs/qgis/DensifyGeometries.py
@@ -72,13 +72,11 @@ def processAlgorithm(self, progress):
         features = vector.features(layer)
         total = 100.0 / len(features)
         for current, f in enumerate(features):
-            featGeometry = f.geometry()
-            attrs = f.attributes()
-            newGeometry = self.densifyGeometry(featGeometry, int(vertices),
-                                               isPolygon)
-            feature = QgsFeature()
-            feature.setGeometry(newGeometry)
-            feature.setAttributes(attrs)
+            feature = f
+            if feature.hasGeometry():
+                new_geometry = self.densifyGeometry(feature.geometry(), int(vertices),
+                                                    isPolygon)
+                feature.setGeometry(new_geometry)
             writer.addFeature(feature)
             progress.setPercentage(int(current * total))
 
diff --git a/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py b/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
@@ -69,13 +69,11 @@ def processAlgorithm(self, progress):
         features = vector.features(layer)
         total = 100.0 / len(features)
         for current, f in enumerate(features):
-            featGeometry = f.geometry()
-            attrs = f.attributes()
-            newGeometry = self.densifyGeometry(featGeometry, interval,
-                                               isPolygon)
-            feature = QgsFeature()
-            feature.setGeometry(newGeometry)
-            feature.setAttributes(attrs)
+            feature = f
+            if feature.hasGeometry():
+                new_geometry = self.densifyGeometry(feature.geometry(), interval,
+                                                    isPolygon)
+                feature.setGeometry(new_geometry)
             writer.addFeature(feature)
 
             progress.setPercentage(int(current * total))
