Attachment #338944 for bug #450610

Lines 276-282 Link Here

(-)configure.in~ (-1 / +1 lines)
276	fi	276	fi
277		277
278	dnl Check for the gif or ungif libraries	278	dnl Check for the gif or ungif libraries
279	AC_CHECK_LIB(gif, PrintGifError, GIFLIB="-lgif", GIFLIB="")	279	AC_CHECK_LIB(gif, DGifOpen, GIFLIB="-lgif", GIFLIB="")
280	dnl MinGW check for libungif	280	dnl MinGW check for libungif
281	AC_CHECK_LIB(ungif, DGifOpen, GIFLIB="-lungif")	281	AC_CHECK_LIB(ungif, DGifOpen, GIFLIB="-lungif")
282	dnl Solaris needs -lX11 on the linker line for ungif to work	282	dnl Solaris needs -lX11 on the linker line for ungif to work

Lines 227-233 Link Here

(-)src/blocks/gifdbl.c.orig (+8 lines)
227	SWFDBLBitmapData ret;	227	SWFDBLBitmapData ret;
228	struct dbl_data gifdata;	228	struct dbl_data gifdata;
229		229
		230	#if GIFLIB_MAJOR >= 5
		231	if((file = DGifOpenFileName(fileName, NULL)) == NULL)
		232	#else
230	if((file = DGifOpenFileName(fileName)) == NULL)	233	if((file = DGifOpenFileName(fileName)) == NULL)
		234	#endif
231	return NULL;	235	return NULL;
232	if(!readGif(file, &gifdata))	236	if(!readGif(file, &gifdata))
233	return NULL;	237	return NULL;
Lines 246-252 Link Here
246	SWFDBLBitmapData ret;	250	SWFDBLBitmapData ret;
247	struct dbl_data gifdata;	251	struct dbl_data gifdata;
248		252
		253	#if GIFLIB_MAJOR >= 5
		254	if((file = DGifOpen(input, (InputFunc) gifReadFunc, NULL)) == NULL)
		255	#else
249	if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL)	256	if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL)
		257	#endif
250	return NULL;	258	return NULL;
251	if(!readGif(file, &gifdata))	259	if(!readGif(file, &gifdata))
252	return NULL;	260	return NULL;




void error(char *msg)
{
  printf("%s:\n\n", msg);
#if GIFLIB_MAJOR < 5
  PrintGifError();
#endif
  exit(-1);
}


  unsigned char *p;
  int i, nColors, size, alpha, bgColor, alignedWidth;

#if GIFLIB_MAJOR >= 5
  int errorCode = 0;

  if((file = DGifOpenFileName(fileName, &errorCode)) == NULL)
    error(GifErrorString(errorCode));
#else
  if((file = DGifOpenFileName(fileName)) == NULL)
    error("Error opening file");
#endif

  if(DGifSlurp(file) != GIF_OK)
    error("Error slurping file");




void error(char *msg)
{
  printf("%s:\n\n", msg);
#if GIFLIB_MAJOR < 5
  PrintGifError();
#endif
  exit(-1);
}


  unsigned char *data;
  int i, nColors, size;

#if GIFLIB_MAJOR < 5
  if((file = DGifOpenFileName(fileName)) == NULL)
    error("Error opening file");
#else
  int errorCode = 0;

  if((file = DGifOpenFileName(fileName, &errorCode)) == NULL)
    error(GifErrorString(errorCode));
#endif

  if(DGifSlurp(file) != GIF_OK)
    error("Error slurping file");

Return to bug 450610

Lines 20-26 Link Here

(-)util/gif2dbl.c.orig (+9 lines)
20	void error(char *msg)	20	void error(char *msg)
21	{	21	{
22	printf("%s:\n\n", msg);	22	printf("%s:\n\n", msg);
		23	#if GIFLIB_MAJOR < 5
23	PrintGifError();	24	PrintGifError();
		25	#endif
24	exit(-1);	26	exit(-1);
25	}	27	}
26		28
Lines 57-64 Link Here
57	unsigned char *p;	59	unsigned char *p;
58	int i, nColors, size, alpha, bgColor, alignedWidth;	60	int i, nColors, size, alpha, bgColor, alignedWidth;
59		61
		62	#if GIFLIB_MAJOR >= 5
		63	int errorCode = 0;
		64
		65	if((file = DGifOpenFileName(fileName, &errorCode)) == NULL)
		66	error(GifErrorString(errorCode));
		67	#else
60	if((file = DGifOpenFileName(fileName)) == NULL)	68	if((file = DGifOpenFileName(fileName)) == NULL)
61	error("Error opening file");	69	error("Error opening file");
		70	#endif
62		71
63	if(DGifSlurp(file) != GIF_OK)	72	if(DGifSlurp(file) != GIF_OK)
64	error("Error slurping file");	73	error("Error slurping file");

Lines 14-20 Link Here

(-)util/gif2mask.c~ (+9 lines)
14	void error(char *msg)	14	void error(char *msg)
15	{	15	{
16	printf("%s:\n\n", msg);	16	printf("%s:\n\n", msg);
		17	#if GIFLIB_MAJOR < 5
17	PrintGifError();	18	PrintGifError();
		19	#endif
18	exit(-1);	20	exit(-1);
19	}	21	}
20		22
Lines 26-33 Link Here
26	unsigned char *data;	28	unsigned char *data;
27	int i, nColors, size;	29	int i, nColors, size;
28		30
		31	#if GIFLIB_MAJOR < 5
29	if((file = DGifOpenFileName(fileName)) == NULL)	32	if((file = DGifOpenFileName(fileName)) == NULL)
30	error("Error opening file");	33	error("Error opening file");
		34	#else
		35	int errorCode = 0;
		36
		37	if((file = DGifOpenFileName(fileName, &errorCode)) == NULL)
		38	error(GifErrorString(errorCode));
		39	#endif
31		40
32	if(DGifSlurp(file) != GIF_OK)	41	if(DGifSlurp(file) != GIF_OK)
33	error("Error slurping file");	42	error("Error slurping file");