diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2016-11-12 21:25:14 +0600 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-02-23 10:26:14 +0100 |
| commit | eff483ff3209b09dbcfbb4a8a137825186c267b1 (patch) | |
| tree | 553f6af742183825ab2f9d3b73249213aced9f53 | |
| parent | 92ce31fd8ced13384e3f5aea80a7d7f437870e74 (diff) | |
| download | django-eff483ff3209b09dbcfbb4a8a137825186c267b1.tar.gz | |
[1.10.x] Fixed #27479 -- Fixed GDALClose prototype
Backport of faf8a253d3fc2d870fb7ab860581e942d2ad9fbc from master.
| -rw-r--r-- | django/contrib/gis/gdal/prototypes/raster.py | 5 | ||||
| -rw-r--r-- | docs/releases/1.10.6.txt | 3 |
2 files changed, 4 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'), diff --git a/docs/releases/1.10.6.txt b/docs/releases/1.10.6.txt index 41a308bba8..6c88d1a714 100644 --- a/docs/releases/1.10.6.txt +++ b/docs/releases/1.10.6.txt @@ -20,3 +20,6 @@ Bugfixes * Fixed query expression date subtraction accuracy on PostgreSQL for differences large an a month (:ticket:`27856`). + +* Fixed a ``GDALException`` raised by ``GDALClose`` on GDAL >= 2.0 + (:ticket:`27479`). |