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

fix giflib4 detection

Browse Source 
and a problem in giflib4 error handling
This commit is contained in:
John Cupitt 2016-05-08 11:02:21 +01:00
parent 379b69fda8
commit f7a6a02ee8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@
- add giflib5 support - add giflib5 support
- allow resize >1 on one axis, <1 on the other - allow resize >1 on one axis, <1 on the other
- vips_resize has an optional @kernel argument - vips_resize has an optional @kernel argument
- fix giflib4 detection [felixbuenemann]
29/1/16 started 8.3 29/1/16 started 8.3
- add vips_reduce*() ... a fast path for affine downsize - add vips_reduce*() ... a fast path for affine downsize

4
acinclude.m4
View File

@ -631,14 +631,14 @@ if test "$GIFLIB_LIBS" = ""; then
INCLUDES="$GIFLIB_INCLUDES $INCLUDES" INCLUDES="$GIFLIB_INCLUDES $INCLUDES"
# Try the standard search path first # Try the standard search path first
AC_TRY_LINK([#include <gif_lib.h>],[EGifSetGifVersion(0,0)], [ AC_TRY_LINK([#include <gif_lib.h>],[DGifSlurp(0)], [
GIFLIB_LIBS="-lgif" GIFLIB_LIBS="-lgif"
], [ ], [
# giflib is not in the standard search path, try $prefix # giflib is not in the standard search path, try $prefix
LIBS="-L${prefix}/lib $LIBS" LIBS="-L${prefix}/lib $LIBS"
AC_TRY_LINK([#include <gif_lib.h>],[EGifSetGifVersion(0,0)], [ AC_TRY_LINK([#include <gif_lib.h>],[DGifSlurp(0)], [
GIFLIB_LIBS="-L${prefix}/lib -lgif" GIFLIB_LIBS="-L${prefix}/lib -lgif"
], [ ], [
GIFLIB_LIBS=no GIFLIB_LIBS=no

2
libvips/foreign/gifload.c
View File

@ -160,7 +160,7 @@ vips_foreign_load_gif_error_vips( VipsForeignLoadGif *gif, int error )
const char *message; const char *message;
if( (message = vips_foreign_load_gif_errstr( gif->file->Error )) ) if( (message = vips_foreign_load_gif_errstr( error )) )
vips_error( class->nickname, "%s", message ); vips_error( class->nickname, "%s", message );
} }