Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[processing] add support for GDAL 2.x in raster tools (refs #14858)
  • Loading branch information
alexbruy committed May 23, 2016
1 parent 26c3ece commit 44c948b
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions python/plugins/processing/tools/raster.py
Expand Up @@ -64,8 +64,14 @@ def scanraster(layer, progress):


def mapToPixel(mX, mY, geoTransform):
(pX, pY) = gdal.ApplyGeoTransform(
gdal.InvGeoTransform(geoTransform)[1], mX, mY)
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)
return (int(pX), int(pY))


Expand Down

0 comments on commit 44c948b

Please sign in to comment.