summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2016-11-12 21:25:14 +0600
committerClaude Paroz <claude@2xlibre.net>2016-11-12 16:25:14 +0100
commitfaf8a253d3fc2d870fb7ab860581e942d2ad9fbc (patch)
tree6588be9e826fa9e172c7049375f0fe5fe787b46c
parentb3162cab94ca2988c99afe01887a4b61d6a35c1a (diff)
Fixed #27479 -- Fixed GDALClose prototype. (#7546)
-rw-r--r--django/contrib/gis/gdal/prototypes/raster.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django/contrib/gis/gdal/prototypes/raster.py b/django/contrib/gis/gdal/prototypes/raster.py
index 8641b86b44..b4519a853d 100644
--- a/django/contrib/gis/gdal/prototypes/raster.py
+++ b/django/contrib/gis/gdal/prototypes/raster.py
@@ -30,10 +30,7 @@ get_driver_description = const_string_output(std_call('GDALGetDescription'), [c_
# Raster Data Source Routines
create_ds = voidptr_output(std_call('GDALCreate'), [c_void_p, c_char_p, c_int, c_int, c_int, c_int, c_void_p])
open_ds = voidptr_output(std_call('GDALOpen'), [c_char_p, c_int])
-if GDAL_VERSION >= (2, 0):
- close_ds = voidptr_output(std_call('GDALClose'), [c_void_p])
-else:
- close_ds = void_output(std_call('GDALClose'), [c_void_p])
+close_ds = void_output(std_call('GDALClose'), [c_void_p], errcheck=False)
flush_ds = int_output(std_call('GDALFlushCache'), [c_void_p])
copy_ds = voidptr_output(
std_call('GDALCreateCopy'),