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

compiler warning

This commit is contained in:
John Cupitt 2016-05-12 14:54:28 +01:00
parent 9fba3b5577
commit 24a51098b1
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -3,8 +3,6 @@
$ vips copy k2.jpg x.dz[suffix=.jpg[Q=90]]
dzsave: not , or ) after parameter
- add n_pages to pdfload
- add more webp tests to py suite
- the gif tests in the suite sometimes fail with giflib5 because of an

15
libvips/iofuncs/header.c
View File

@ -433,10 +433,10 @@ vips_image_guess_format( const VipsImage *image )
break;
case VIPS_INTERPRETATION_CMYK:
if( image->BandFmt != VIPS_FORMAT_USHORT )
format = VIPS_FORMAT_UCHAR;
if( image->BandFmt == VIPS_FORMAT_USHORT )
format = VIPS_FORMAT_USHORT;
else
format = image->BandFmt;
format = VIPS_FORMAT_UCHAR;
break;
case VIPS_INTERPRETATION_LABQ:
@ -453,14 +453,15 @@ vips_image_guess_format( const VipsImage *image )
break;
case VIPS_INTERPRETATION_MATRIX:
if( image->BandFmt != VIPS_FORMAT_DOUBLE )
format = VIPS_FORMAT_FLOAT;
if( image->BandFmt == VIPS_FORMAT_DOUBLE )
format = VIPS_FORMAT_DOUBLE;
else
format = image->BandFmt;
format = VIPS_FORMAT_FLOAT;
break;
default:
g_assert_not_reached();
format = VIPS_FORMAT_NOTSET;
break;
}
return( format );