archive-gh-me/rasterio
1
0
Fork 0
mirror of https://github.com/rasterio/rasterio.git synced 2025-12-08 17:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Use GDAL gdal-2.1.0RC4

Browse Source
This commit is contained in:
Sean Gillies 2016-04-25 12:07:26 -06:00
parent 7f5f614db4
commit 36c26eef2f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rasterio/_drivers.pyx
View File

@ -16,7 +16,8 @@ cdef extern from "cpl_conv.h":
cdef extern from "cpl_error.h":
void CPLSetErrorHandler (void *handler)
void CPLSetErrorHandler(void *handler)
void CPLSetCurrentErrorHandlerCatchDebug(int bCatchDebug)
cdef extern from "gdal.h":
@ -159,6 +160,7 @@ cdef class GDALEnv(ConfigEnv):
GDALAllRegister()
OGRRegisterAll()
CPLSetErrorHandler(<void *>errorHandler)
CPLSetCurrentErrorHandlerCatchDebug(1)
if driver_count() == 0:
raise ValueError("Drivers not registered")

4
scripts/travis_gdal_install.sh
View File

@ -91,8 +91,8 @@ fi
if [ ! -d $GDALINST/gdal-2.1.0 ]; then
cd $GDALBUILD
wget http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0RC3.tar.gz
tar -xzf gdal-2.1.0RC3.tar.gz
wget http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0RC4.tar.gz
tar -xzf gdal-2.1.0RC4.tar.gz
cd gdal-2.1.0
./configure --prefix=$GDALINST/gdal-2.1.0 $GDALOPTS
make -s -j 2