12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667 |
- diff -Naur fbv-1.0b/gif.c fbv-1.0b.patched/gif.c
- --- fbv-1.0b/gif.c 2003-08-24 16:23:02.000000000 -0400
- +++ fbv-1.0b.patched/gif.c 2015-11-22 12:16:54.093999000 -0500
- @@ -31,10 +31,10 @@
- #include <string.h>
- #define min(a,b) ((a) < (b) ? (a) : (b))
- #define gflush return(FH_ERROR_FILE);
- -#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
- -#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
- +#define grflush { int dummy; DGifCloseFile(gft, &dummy); return(FH_ERROR_FORMAT); }
- +#define mgrflush { int dummy; free(lb); free(slb); DGifCloseFile(gft, &dummy); return(FH_ERROR_FORMAT); }
- #define agflush return(FH_ERROR_FORMAT);
- -#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
- +#define agrflush { int dummy; DGifCloseFile(gft, &dummy); return(FH_ERROR_FORMAT); }
-
-
- int fh_gif_id(char *name)
- @@ -80,8 +80,9 @@
- GifRecordType rt;
- ColorMapObject *cmap;
- int cmaps;
- + int dummyopenarg;
-
- - gft=DGifOpenFileName(name);
- + gft=DGifOpenFileName(name, &dummyopenarg);
- if(gft==NULL){printf("err5\n"); gflush;} //////////
- do
- {
- @@ -170,7 +171,7 @@
- }
- }
- while( rt!= TERMINATE_RECORD_TYPE );
- - DGifCloseFile(gft);
- + DGifCloseFile(gft, &dummyopenarg);
- return(FH_ERROR_OK);
- }
-
- @@ -183,8 +184,9 @@
- GifByteType *extension;
- int extcode;
- GifRecordType rt;
- + int dummyopenarg;
-
- - gft=DGifOpenFileName(name);
- + gft=DGifOpenFileName(name, &dummyopenarg);
- if(gft==NULL) gflush;
- do
- {
- @@ -197,7 +199,7 @@
- px=gft->Image.Width;
- py=gft->Image.Height;
- *x=px; *y=py;
- - DGifCloseFile(gft);
- + DGifCloseFile(gft, &dummyopenarg);
- return(FH_ERROR_OK);
- break;
- case EXTENSION_RECORD_TYPE:
- @@ -210,7 +212,7 @@
- }
- }
- while( rt!= TERMINATE_RECORD_TYPE );
- - DGifCloseFile(gft);
- + DGifCloseFile(gft, &dummyopenarg);
- return(FH_ERROR_FORMAT);
- }
- #endif
|