Merge branch '8.4'
This commit is contained in:
commit
75dee18848
@ -3,6 +3,9 @@
|
||||
- added tiff save to buffer
|
||||
- added dzsave save to buffer (zip only)
|
||||
|
||||
18/10/16 started 8.4.3
|
||||
- fix error detection in gif_close, thanks aaron42net
|
||||
|
||||
27/9/16 started 8.4.2
|
||||
- small doc improvements
|
||||
- fix error message for metadata fetch type mismatch
|
||||
|
@ -37,9 +37,9 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date`
|
||||
# binary interface changes backwards compatible?: increment age
|
||||
# binary interface changes not backwards compatible?: reset age to 0
|
||||
|
||||
LIBRARY_CURRENT=48
|
||||
LIBRARY_REVISION=3
|
||||
LIBRARY_AGE=6
|
||||
LIBRARY_CURRENT=49
|
||||
LIBRARY_REVISION=0
|
||||
LIBRARY_AGE=7
|
||||
|
||||
# patched into include/vips/version.h
|
||||
AC_SUBST(VIPS_VERSION)
|
||||
|
@ -208,13 +208,13 @@ vips_foreign_load_gif_close( VipsForeignLoadGif *gif )
|
||||
if( gif->file ) {
|
||||
int error;
|
||||
|
||||
if( DGifCloseFile( gif->file, &error ) )
|
||||
if( DGifCloseFile( gif->file, &error ) == GIF_ERROR )
|
||||
vips_foreign_load_gif_error_vips( gif, error );
|
||||
gif->file = NULL;
|
||||
}
|
||||
#else
|
||||
if( gif->file ) {
|
||||
if( DGifCloseFile( gif->file ) )
|
||||
if( DGifCloseFile( gif->file ) == GIF_ERROR )
|
||||
vips_foreign_load_gif_error_vips( gif, GifLastError() );
|
||||
gif->file = NULL;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user