sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] remove code with GDAL 1.x API as QGIS 3 will require GDAL 2.x

Browse Source
This commit is contained in:
Alexander Bruy 2017-02-09 14:15:31 +02:00
parent 5489f855a7
commit f66646c483
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/plugins/processing/algs/gdal/warp.py
View File

@ -90,10 +90,9 @@ class warp(GdalAlgorithm):
self.tr('Raster extent'),
optional=True))
if GdalUtils.version() >= 2000000:
self.addParameter(ParameterCrs(self.EXT_CRS,
self.tr('CRS of the raster extent, leave blank for using Destination SRS'),
optional=True))
self.addParameter(ParameterCrs(self.EXT_CRS,
self.tr('CRS of the raster extent, leave blank for using Destination SRS'),
optional=True))
self.addParameter(ParameterString(self.OPTIONS,
self.tr('Additional creation options'),
@ -151,10 +150,9 @@ class warp(GdalAlgorithm):
arguments.append(regionCoords[1])
arguments.append(regionCoords[3])
if GdalUtils.version() >= 2000000:
if rastext_crs:
arguments.append('-te_srs')
arguments.append(rastext_crs)
if rastext_crs:
arguments.append('-te_srs')
arguments.append(rastext_crs)
if opts:
arguments.append('-co')

10
python/plugins/processing/tools/raster.py
View File

@ -104,14 +104,8 @@ def scanraster(layer, feedback):
def mapToPixel(mX, mY, geoTransform):
try:
# GDAL 1.x
(pX, pY) = gdal.ApplyGeoTransform(
gdal.InvGeoTransform(geoTransform)[1], mX, mY)
except TypeError:
# GDAL 2.x
(pX, pY) = gdal.ApplyGeoTransform(
gdal.InvGeoTransform(geoTransform), mX, mY)
(pX, pY) = gdal.ApplyGeoTransform(
gdal.InvGeoTransform(geoTransform), mX, mY)
return (int(pX), int(pY))