sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Cupitt 2017-03-02 09:30:42 +00:00
commit 1046619f3a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -5,7 +5,7 @@ before_script:
--disable-dependency-tracking --disable-dependency-tracking
--with-jpeg-includes=$JPEG/include --with-jpeg-includes=$JPEG/include
--with-jpeg-libraries=$JPEG/lib --with-jpeg-libraries=$JPEG/lib
- make -j$JOBS -s V=0 - make -j$JOBS -s
script: script:
- make -Ctest -j$JOBS -s V=0 VERBOSE=1 check - make -Ctest -j$JOBS -s V=0 VERBOSE=1 check
@ -72,7 +72,7 @@ matrix:
- brew install --ignore-dependencies gtk-doc - brew install --ignore-dependencies gtk-doc
- brew install - brew install
gobject-introspection gobject-introspection
expat fftw mozjpeg libexif fftw mozjpeg libexif
libpng webp libpng webp
swig imagemagick swig imagemagick
cfitsio libmatio cfitsio libmatio

2
libvips/iofuncs/header.c
View File

@ -416,7 +416,7 @@ vips_image_guess_format( const VipsImage *image )
/* Stop a compiler warning. /* Stop a compiler warning.
*/ */
format = VIPS_INTERPRETATION_MULTIBAND; format = VIPS_FORMAT_UCHAR;
switch( image->Type ) { switch( image->Type ) {
case VIPS_INTERPRETATION_B_W: case VIPS_INTERPRETATION_B_W: