Permalink
Browse files

Added support for gdal 1.9.

  • Loading branch information...
1 parent f8ef93a commit 45a1a54b0b234996a9880bd89924df2aa86b8f9a @dgerzo dgerzo committed with apollo13 Jun 10, 2012
Showing with 11 additions and 10 deletions.
  1. +11 −10 django/contrib/gis/gdal/libgdal.py
@@ -15,31 +15,32 @@
lib_names = None
elif os.name == 'nt':
# Windows NT shared libraries
- lib_names = ['gdal18', 'gdal17', 'gdal16', 'gdal15']
+ lib_names = ['gdal19', 'gdal18', 'gdal17', 'gdal16', 'gdal15']
elif os.name == 'posix':
# *NIX library names.
- lib_names = ['gdal', 'GDAL', 'gdal1.8.0', 'gdal1.7.0', 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
+ lib_names = ['gdal', 'GDAL', 'gdal1.9.0', 'gdal1.8.0', 'gdal1.7.0',
+ 'gdal1.6.0', 'gdal1.5.0', 'gdal1.4.0']
else:
raise OGRException('Unsupported OS "%s"' % os.name)
-# Using the ctypes `find_library` utility to find the
+# Using the ctypes `find_library` utility to find the
# path to the GDAL library from the list of library names.
if lib_names:
for lib_name in lib_names:
lib_path = find_library(lib_name)
if not lib_path is None: break
-
+
if lib_path is None:
raise OGRException('Could not find the GDAL library (tried "%s"). '
- 'Try setting GDAL_LIBRARY_PATH in your settings.' %
+ 'Try setting GDAL_LIBRARY_PATH in your settings.' %
'", "'.join(lib_names))
# This loads the GDAL/OGR C library
lgdal = CDLL(lib_path)
-# On Windows, the GDAL binaries have some OSR routines exported with
-# STDCALL, while others are not. Thus, the library will also need to
-# be loaded up as WinDLL for said OSR functions that require the
+# On Windows, the GDAL binaries have some OSR routines exported with
+# STDCALL, while others are not. Thus, the library will also need to
+# be loaded up as WinDLL for said OSR functions that require the
# different calling convention.
if os.name == 'nt':
from ctypes import WinDLL
@@ -66,11 +67,11 @@ def gdal_version():
"Returns only the GDAL version number information."
return _version_info('RELEASE_NAME')
-def gdal_full_version():
+def gdal_full_version():
"Returns the full GDAL version information."
return _version_info('')
-def gdal_release_date(date=False):
+def gdal_release_date(date=False):
"""
Returns the release date in a string format, e.g, "2007/06/27".
If the date keyword argument is set to True, a Python datetime object

0 comments on commit 45a1a54

Please sign in to comment.