Attachment #373314 for bug #486372




#endif /* HAVE_LIBTIFF */

#ifdef HAVE_LIBGIF

  // on giflib-4.2+, PrintGifError is gone and GifErrorString is in
  #ifdef HAVE_GIF_ERROR_STRING
    #if (GIFLIB_MAJOR >= 5)
      #define GifError() (gif ? gif->Error : 0)
      #define GifErrorString() GifErrorString(GifError())
    #endif
    #define myPrintGifError2() \
    do { \
      const char* errorString = GifErrorString(); \
      if (errorString != NULL) \
        fprintf(stderr, "giflib: error: %s\n", errorString); \
      else \
        fprintf(stderr, "giflib: error (undefined): %d\n", GifError()); \
    } while (0)
  #else
    #define myPrintGifError2() PrintGifError()
  #endif

unsigned char      *
_LoadGIF(ImlibData * id, FILE *f, int *w, int *h, int *t)
{

    {
      if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
	{
	  myPrintGifError2();
	  rec = TERMINATE_RECORD_TYPE;
	}
      if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
	{
	  if (DGifGetImageDesc(gif) == GIF_ERROR)
	    {
	      myPrintGifError2();
	      rec = TERMINATE_RECORD_TYPE;
	    }
	  *w = gif->Image.Width;




#else
#include <gif_lib.h>


  // on giflib-4.2+, PrintGifError is gone and GifErrorString is in
  #ifdef HAVE_GIF_ERROR_STRING
    #if (GIFLIB_MAJOR >= 5)
      #define GifError() (gif ? gif->Error : 0)
      #define GifErrorString() GifErrorString(GifError())
    #endif
    #define myPrintGifError() \
    do { \
      const char* errorString = GifErrorString(); \
      if (errorString != NULL) \
        fprintf(stderr, "giflib: error: %s\n", errorString); \
      else \
        fprintf(stderr, "giflib: error (undefined): %d\n", GifError()); \
    } while (0)
  #else
    #define myPrintGifError() PrintGifError()
  #endif

unsigned char      *
loader_gif(FILE *f, int *w, int *h, int *t)
{

    {
      if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
	{
	  myPrintGifError();
	  rec = TERMINATE_RECORD_TYPE;
	}
      if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
	{
	  if (DGifGetImageDesc(gif) == GIF_ERROR)
	    {
	      myPrintGifError();
	      rec = TERMINATE_RECORD_TYPE;
	    }
	  *w = gif->Image.Width;

Lines 29-34 Link Here

(-)imlib-1.9.15.orig/config.h.in (+3 lines)
29	#undef HAVE_LIBGIF	29	#undef HAVE_LIBGIF
30		30
31	/* */	31	/* */
		32	#undef HAVE_GIF_ERROR_STRING
		33
		34	/* */
32	#undef HAVE_LIBJPEG	35	#undef HAVE_LIBJPEG
33		36
34	/* */	37	/* */

Lines 253-262 AC_CHECK_LIB(tiff, TIFFReadScanline, Link Here

(-)imlib-1.9.15.orig/configure.in (-1 / +6 lines)
253	AC_CHECK_HEADER(gif_lib.h,	253	AC_CHECK_HEADER(gif_lib.h,
254	[AC_CHECK_LIB(ungif, DGifOpenFileName,	254	[AC_CHECK_LIB(ungif, DGifOpenFileName,
255	[GIFLIBS="-lungif"	255	[GIFLIBS="-lungif"
256	SUPPORT_LIBS="$SUPPORT_LIBS -lungif"; AC_DEFINE(HAVE_LIBGIF, 1, [ ])],	256	SUPPORT_LIBS="$SUPPORT_LIBS -lungif"
		257	AC_CHECK_LIB(ungif, GifErrorString,
		258	[AC_DEFINE(HAVE_GIF_ERROR_STRING, 1, [ ])])
		259	AC_DEFINE(HAVE_LIBGIF, 1, [ ])],
257	[AC_CHECK_LIB(gif, DGifOpenFileName,	260	[AC_CHECK_LIB(gif, DGifOpenFileName,
258	[GIFLIBS="-lgif"	261	[GIFLIBS="-lgif"
259	SUPPORT_LIBS="$SUPPORT_LIBS -lgif"	262	SUPPORT_LIBS="$SUPPORT_LIBS -lgif"
		263	AC_CHECK_LIB(gif, GifErrorString,
		264	[AC_DEFINE(HAVE_GIF_ERROR_STRING, 1, [ ])])
260	AC_DEFINE(HAVE_LIBGIF, 1, [ ])],	265	AC_DEFINE(HAVE_LIBGIF, 1, [ ])],
261	[AC_MSG_ERROR(* GIF library file not found *)],	266	[AC_MSG_ERROR(* GIF library file not found *)],
262	$GX_LIBS)],	267	$GX_LIBS)],

Return to bug 486372

Lines 431-436 _LoadTIFF(ImlibData * id, FILE *f, char Link Here

(-)imlib-1.9.15.orig/Imlib/load.c (-2 / +21 lines)
431	#endif /* HAVE_LIBTIFF */	431	#endif /* HAVE_LIBTIFF */
432		432
433	#ifdef HAVE_LIBGIF	433	#ifdef HAVE_LIBGIF
		434
		435	// on giflib-4.2+, PrintGifError is gone and GifErrorString is in
		436	#ifdef HAVE_GIF_ERROR_STRING
		437	#if (GIFLIB_MAJOR >= 5)
		438	#define GifError() (gif ? gif->Error : 0)
		439	#define GifErrorString() GifErrorString(GifError())
		440	#endif
		441	#define myPrintGifError2() \
		442	do { \
		443	const char* errorString = GifErrorString(); \
		444	if (errorString != NULL) \
		445	fprintf(stderr, "giflib: error: %s\n", errorString); \
		446	else \
		447	fprintf(stderr, "giflib: error (undefined): %d\n", GifError()); \
		448	} while (0)
		449	#else
		450	#define myPrintGifError2() PrintGifError()
		451	#endif
		452
434	unsigned char *	453	unsigned char *
435	_LoadGIF(ImlibData * id, FILE f, int w, int h, int t)	454	_LoadGIF(ImlibData * id, FILE f, int w, int h, int t)
436	{	455	{
Lines 466-479 _LoadGIF(ImlibData * id, FILE f, int w Link Here
466	{	482	{
467	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)	483	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
468	{	484	{
469	PrintGifError();	485	myPrintGifError2();
470	rec = TERMINATE_RECORD_TYPE;	486	rec = TERMINATE_RECORD_TYPE;
471	}	487	}
472	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))	488	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
473	{	489	{
474	if (DGifGetImageDesc(gif) == GIF_ERROR)	490	if (DGifGetImageDesc(gif) == GIF_ERROR)
475	{	491	{
476	PrintGifError();	492	myPrintGifError2();
477	rec = TERMINATE_RECORD_TYPE;	493	rec = TERMINATE_RECORD_TYPE;
478	}	494	}
479	*w = gif->Image.Width;	495	*w = gif->Image.Width;

Lines 10-15 unsigned char loader_gif (FILE f, int Link Here

(-)imlib-1.9.15.orig/gdk_imlib/io-gif.c (-2 / +21 lines)
10	#else	10	#else
11	#include <gif_lib.h>	11	#include <gif_lib.h>
12		12
		13
		14	// on giflib-4.2+, PrintGifError is gone and GifErrorString is in
		15	#ifdef HAVE_GIF_ERROR_STRING
		16	#if (GIFLIB_MAJOR >= 5)
		17	#define GifError() (gif ? gif->Error : 0)
		18	#define GifErrorString() GifErrorString(GifError())
		19	#endif
		20	#define myPrintGifError() \
		21	do { \
		22	const char* errorString = GifErrorString(); \
		23	if (errorString != NULL) \
		24	fprintf(stderr, "giflib: error: %s\n", errorString); \
		25	else \
		26	fprintf(stderr, "giflib: error (undefined): %d\n", GifError()); \
		27	} while (0)
		28	#else
		29	#define myPrintGifError() PrintGifError()
		30	#endif
		31
13	unsigned char *	32	unsigned char *
14	loader_gif(FILE f, int w, int h, int t)	33	loader_gif(FILE f, int w, int h, int t)
15	{	34	{
Lines 47-60 loader_gif(FILE f, int w, int *h, int Link Here
47	{	62	{
48	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)	63	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
49	{	64	{
50	PrintGifError();	65	myPrintGifError();
51	rec = TERMINATE_RECORD_TYPE;	66	rec = TERMINATE_RECORD_TYPE;
52	}	67	}
53	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))	68	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
54	{	69	{
55	if (DGifGetImageDesc(gif) == GIF_ERROR)	70	if (DGifGetImageDesc(gif) == GIF_ERROR)
56	{	71	{
57	PrintGifError();	72	myPrintGifError();
58	rec = TERMINATE_RECORD_TYPE;	73	rec = TERMINATE_RECORD_TYPE;
59	}	74	}
60	*w = gif->Image.Width;	75	*w = gif->Image.Width;