From 44c948b014e8009020dbc68d8842f3bf2748197c Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Mon, 23 May 2016 18:15:46 +0300 Subject: [PATCH] [processing] add support for GDAL 2.x in raster tools (refs #14858) --- python/plugins/processing/tools/raster.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python/plugins/processing/tools/raster.py b/python/plugins/processing/tools/raster.py index 00082bd5d82..4cfd3e938c8 100644 --- 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))