Skip to content

Commit

Permalink
[Processing] Fix TypeError in Zonal Statistics algorithm
Browse files Browse the repository at this point in the history
Fixes #14412
  • Loading branch information
radosuav committed Mar 7, 2016
1 parent b1b7b65 commit 9c611c9
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions python/plugins/processing/tools/raster.py
Original file line number Diff line number Diff line change
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 9c611c9

Please sign in to comment.