sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

get rid of multiple inheritance, fix missed import

Browse Source
This commit is contained in:
Alexander Bruy 2016-01-21 17:56:48 +02:00
parent fe2bb2f09f
commit cf02a71bb0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/plugins/processing/algs/gdal/ClipByMask.py
View File

@ -27,8 +27,6 @@ __revision__ = '$Format:%H$'
from osgeo import gdal
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterBoolean
@ -41,8 +39,10 @@ from processing.core.outputs import OutputRaster
from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools import dataobjects
class ClipByMask(GdalAlgorithm, OgrAlgorithm):
class ClipByMask(OgrAlgorithm):
INPUT = 'INPUT'
OUTPUT = 'OUTPUT'
@ -149,7 +149,7 @@ class ClipByMask(GdalAlgorithm, OgrAlgorithm):
arguments.append('-cutline')
arguments.append(ogrMask)
if maskLayer.subsetString() != '':
if maskLayer and maskLayer.subsetString() != '':
arguments.append('-cwhere')
arguments.append(maskLayer.subsetString())