Skip to content

Commit

Permalink
Remove use of constGeometry
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Aug 2, 2016
1 parent bb54b4f commit 60147e8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/MergeLines.py
Expand Up @@ -75,7 +75,7 @@ def processAlgorithm(self, progress):
attrs = inFeat.attributes()
outFeat.setAttributes(attrs)

inGeom = inFeat.constGeometry()
inGeom = inFeat.geometry()
if inGeom:
outGeom = inGeom.mergeLines()
if outGeom is None:
Expand Down
Expand Up @@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
attrs = f.attributes()
outFeat.setAttributes(attrs)

inGeom = f.constGeometry()
inGeom = f.geometry()
if inGeom:
geometries = self.extractAsSingle(inGeom)

Expand Down
15 changes: 0 additions & 15 deletions python/plugins/processing/tests/testdata/expected/merge_lines.gfs

This file was deleted.

0 comments on commit 60147e8

Please sign in to comment.