Attachment #368274 for bug #486372




#endif /* HAVE_LIBTIFF */

#ifdef HAVE_LIBGIF
/*------------------------*/
static void
_PrintGifError(GifFileType *gif)
{
  /* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
  /* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
           ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
  /* Static string actually, hence the const char* cast */
  
#if GIFLIB_MAJOR >= 5
  const char* gifliberr = (const char*) GifErrorString(gif->Error);
#else
  const char* gifliberr = (const char*) GifErrorString();
#endif
  if (gifliberr == NULL)
      gifliberr = "Unknown error";
  fprintf(stderr, "%s\n", gifliberr);
#else
  PrintGifError();
#endif
}
/*------------------------*/
unsigned char      *
_LoadGIF(ImlibData * id, FILE *f, int *w, int *h, int *t)
{

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




#include "gdk_imlib_private.h"

#ifndef HAVE_LIBGIF
/*------------------------*/
static void
_PrintGifError(GifFileType *gif)
{
  /* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
  /* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
           ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
  /* Static string actually, hence the const char* cast */
  
#if GIFLIB_MAJOR >= 5
  const char* gifliberr = (const char*) GifErrorString(gif->Error);
#else
  const char* gifliberr = (const char*) GifErrorString();
#endif
  if (gifliberr == NULL)
      gifliberr = "Unknown error";
  fprintf(stderr, "%s\n", gifliberr);
#else
  PrintGifError();
#endif
}
/*------------------------*/
unsigned char loader_gif (FILE *f, int *w, int *h, int *t)
{
	return NULL;

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

Return to bug 486372

Lines 431-436 Link Here

(-)Imlib/load.c.old (-2 / +25 lines)
431	#endif /* HAVE_LIBTIFF */	431	#endif /* HAVE_LIBTIFF */
432		432
433	#ifdef HAVE_LIBGIF	433	#ifdef HAVE_LIBGIF
		434	/------------------------/
		435	static void
		436	_PrintGifError(GifFileType *gif)
		437	{
		438	/* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
		439	/* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
		440	#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
		441	((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) \|\| GIFLIB_MAJOR > 4)
		442	/* Static string actually, hence the const char* cast */
		443
		444	#if GIFLIB_MAJOR >= 5
		445	const char* gifliberr = (const char*) GifErrorString(gif->Error);
		446	#else
		447	const char* gifliberr = (const char*) GifErrorString();
		448	#endif
		449	if (gifliberr == NULL)
		450	gifliberr = "Unknown error";
		451	fprintf(stderr, "%s\n", gifliberr);
		452	#else
		453	PrintGifError();
		454	#endif
		455	}
		456	/------------------------/
434	unsigned char *	457	unsigned char *
435	_LoadGIF(ImlibData * id, FILE f, int w, int h, int t)	458	_LoadGIF(ImlibData * id, FILE f, int w, int h, int t)
436	{	459	{
Lines 462-475 Link Here
462	{	485	{
463	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)	486	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
464	{	487	{
465	PrintGifError();	488	_PrintGifError(gif);
466	rec = TERMINATE_RECORD_TYPE;	489	rec = TERMINATE_RECORD_TYPE;
467	}	490	}
468	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))	491	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
469	{	492	{
470	if (DGifGetImageDesc(gif) == GIF_ERROR)	493	if (DGifGetImageDesc(gif) == GIF_ERROR)
471	{	494	{
472	PrintGifError();	495	_PrintGifError(gif);
473	rec = TERMINATE_RECORD_TYPE;	496	rec = TERMINATE_RECORD_TYPE;
474	}	497	}
475	*w = gif->Image.Width;	498	*w = gif->Image.Width;

Lines 3-8 Link Here

(-)gdk_imlib/io-gif.c.old (-2 / +25 lines)
3	#include "gdk_imlib_private.h"	3	#include "gdk_imlib_private.h"
4		4
5	#ifndef HAVE_LIBGIF	5	#ifndef HAVE_LIBGIF
		6	/------------------------/
		7	static void
		8	_PrintGifError(GifFileType *gif)
		9	{
		10	/* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
		11	/* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
		12	#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
		13	((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) \|\| GIFLIB_MAJOR > 4)
		14	/* Static string actually, hence the const char* cast */
		15
		16	#if GIFLIB_MAJOR >= 5
		17	const char* gifliberr = (const char*) GifErrorString(gif->Error);
		18	#else
		19	const char* gifliberr = (const char*) GifErrorString();
		20	#endif
		21	if (gifliberr == NULL)
		22	gifliberr = "Unknown error";
		23	fprintf(stderr, "%s\n", gifliberr);
		24	#else
		25	PrintGifError();
		26	#endif
		27	}
		28	/------------------------/
6	unsigned char loader_gif (FILE f, int w, int h, int t)	29	unsigned char loader_gif (FILE f, int w, int h, int t)
7	{	30	{
8	return NULL;	31	return NULL;
Lines 43-56 Link Here
43	{	66	{
44	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)	67	if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
45	{	68	{
46	PrintGifError();	69	_PrintGifError(gif);
47	rec = TERMINATE_RECORD_TYPE;	70	rec = TERMINATE_RECORD_TYPE;
48	}	71	}
49	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))	72	if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
50	{	73	{
51	if (DGifGetImageDesc(gif) == GIF_ERROR)	74	if (DGifGetImageDesc(gif) == GIF_ERROR)
52	{	75	{
53	PrintGifError();	76	_PrintGifError(gif);
54	rec = TERMINATE_RECORD_TYPE;	77	rec = TERMINATE_RECORD_TYPE;
55	}	78	}
56	*w = gif->Image.Width;	79	*w = gif->Image.Width;