[Processing] Fix TypeError in Zonal Statistics algorithm

Fixes #14412
qgis · Mar 7, 2016 · 9c611c9 · 9c611c9
1 parent b1b7b65
commit 9c611c9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/python/plugins/processing/tools/raster.py b/python/plugins/processing/tools/raster.py
@@ -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))