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

fix compile without jpeg

Browse Source 
im_jpeg2vips.c failed to compile if jpeglib.h was missing, thanks
Alessandro
This commit is contained in:
John Cupitt 2013-03-22 09:12:06 +00:00
parent 028e93430e
commit 4ebe588da6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
- removed some left-over debugging code from configure.ac - removed some left-over debugging code from configure.ac
- better handling of args without values, thanks Ruven - better handling of args without values, thanks Ruven
- better error messages from vips.c - better error messages from vips.c
- im_jpeg2vips.c builds without jpeglib.h, thanks Alessandro
6/2/13 started 7.32.1 6/2/13 started 7.32.1
- fix --without-lcms, thanks speckins - fix --without-lcms, thanks speckins

7
libvips/deprecated/im_jpeg2vips.c
View File

@ -44,13 +44,15 @@
#include <vips/intl.h> #include <vips/intl.h>
#include <stdlib.h> #include <stdlib.h>
#include <setjmp.h>
#include <vips/vips.h> #include <vips/vips.h>
#include <setjmp.h> #ifdef HAVE_JPEG
#include <jpeglib.h> #include <jpeglib.h>
#include <jerror.h> #include <jerror.h>
#include "../foreign/jpeg.h" #include "../foreign/jpeg.h"
#endif /*HAVE_JPEG*/
static int static int
jpeg2vips( const char *name, IMAGE *out, gboolean header_only ) jpeg2vips( const char *name, IMAGE *out, gboolean header_only )
@ -116,7 +118,8 @@ jpeg2vips( const char *name, IMAGE *out, gboolean header_only )
header_only, shrink, fail_on_warn ) ) header_only, shrink, fail_on_warn ) )
return( -1 ); return( -1 );
#else #else
vips_error( "im_jpeg2vips", _( "no JPEG support in your libvips" ) ); vips_error( "im_jpeg2vips",
"%s", _( "no JPEG support in your libvips" ) );
return( -1 ); return( -1 );
#endif /*HAVE_JPEG*/ #endif /*HAVE_JPEG*/