Merge branch 'master' into mask-return-type

rasterio · Sep 13, 2017 · 4a09df2 · 4a09df2
2 parents 330574f + b69f4c0
commit 4a09df2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,6 @@ addons:
     - gdal-bin
     - libproj-dev
     - libhdf5-serial-dev
-    - libpng12-dev
     - libgdal-dev
     - libatlas-dev
     - libatlas-base-dev

diff --git a/scripts/travis_gdal_install.sh b/scripts/travis_gdal_install.sh
@@ -17,7 +17,7 @@ GDALOPTS="  --with-ogr \
             --without-cfitsio \
             --without-pcraster \
             --without-netcdf \
-            --with-png=/usr \
+            --with-png=internal \
             --with-jpeg=internal \
             --without-gif \
             --without-ogdi \