Merge branch 'master' of github.com:jcupitt/libvips

2017-03-02 09:30:42 +00:00 · 2017-03-02 09:30:42 +00:00 · 1046619f3a
commit 1046619f3a
parent 6c0fe14c90 db853ae0dd
2 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,7 @@ before_script:
    --disable-dependency-tracking
    --with-jpeg-includes=$JPEG/include
    --with-jpeg-libraries=$JPEG/lib
-  - make -j$JOBS -s V=0
+  - make -j$JOBS -s 
 script:
  - make -Ctest -j$JOBS -s V=0 VERBOSE=1 check

@ -72,7 +72,7 @@ matrix:
        - brew install --ignore-dependencies gtk-doc
        - brew install
          gobject-introspection
-          expat fftw mozjpeg libexif
+          fftw mozjpeg libexif
          libpng webp 
          swig imagemagick
          cfitsio libmatio
--- a/libvips/iofuncs/header.c
+++ b/libvips/iofuncs/header.c
@ -416,7 +416,7 @@ vips_image_guess_format( const VipsImage *image )

 	/* Stop a compiler warning.
 	 */
-	format = VIPS_INTERPRETATION_MULTIBAND; 
+	format = VIPS_FORMAT_UCHAR; 

 	switch( image->Type ) {
 	case VIPS_INTERPRETATION_B_W: