1*4882a593SmuzhiyunAdjust source code to work with giflib 5.1x 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunDownloaded patch for gif.c from 4*4882a593Smuzhiyunhttps://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib-5.1.patch?h=packages/fbv 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 7*4882a593Smuzhiyun 8*4882a593Smuzhiyundiff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c 9*4882a593Smuzhiyun--- fbv-1.0b/gif.c 2003-08-25 00:23:02.000000000 +0400 10*4882a593Smuzhiyun+++ fbv-1.0b.my/gif.c 2014-05-29 18:39:41.337332872 +0400 11*4882a593Smuzhiyun@@ -31,10 +31,10 @@ 12*4882a593Smuzhiyun #include <string.h> 13*4882a593Smuzhiyun #define min(a,b) ((a) < (b) ? (a) : (b)) 14*4882a593Smuzhiyun #define gflush return(FH_ERROR_FILE); 15*4882a593Smuzhiyun-#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } 16*4882a593Smuzhiyun-#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); } 17*4882a593Smuzhiyun+#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } 18*4882a593Smuzhiyun+#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } 19*4882a593Smuzhiyun #define agflush return(FH_ERROR_FORMAT); 20*4882a593Smuzhiyun-#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } 21*4882a593Smuzhiyun+#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun int fh_gif_id(char *name) 25*4882a593Smuzhiyun@@ -81,7 +81,7 @@ 26*4882a593Smuzhiyun ColorMapObject *cmap; 27*4882a593Smuzhiyun int cmaps; 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun- gft=DGifOpenFileName(name); 30*4882a593Smuzhiyun+ gft=DGifOpenFileName(name, NULL); 31*4882a593Smuzhiyun if(gft==NULL){printf("err5\n"); gflush;} ////////// 32*4882a593Smuzhiyun do 33*4882a593Smuzhiyun { 34*4882a593Smuzhiyun@@ -170,7 +170,7 @@ 35*4882a593Smuzhiyun } 36*4882a593Smuzhiyun } 37*4882a593Smuzhiyun while( rt!= TERMINATE_RECORD_TYPE ); 38*4882a593Smuzhiyun- DGifCloseFile(gft); 39*4882a593Smuzhiyun+ DGifCloseFile(gft, NULL); 40*4882a593Smuzhiyun return(FH_ERROR_OK); 41*4882a593Smuzhiyun } 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun@@ -184,7 +184,7 @@ 44*4882a593Smuzhiyun int extcode; 45*4882a593Smuzhiyun GifRecordType rt; 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun- gft=DGifOpenFileName(name); 48*4882a593Smuzhiyun+ gft=DGifOpenFileName(name, NULL); 49*4882a593Smuzhiyun if(gft==NULL) gflush; 50*4882a593Smuzhiyun do 51*4882a593Smuzhiyun { 52*4882a593Smuzhiyun@@ -197,7 +197,7 @@ 53*4882a593Smuzhiyun px=gft->Image.Width; 54*4882a593Smuzhiyun py=gft->Image.Height; 55*4882a593Smuzhiyun *x=px; *y=py; 56*4882a593Smuzhiyun- DGifCloseFile(gft); 57*4882a593Smuzhiyun+ DGifCloseFile(gft, NULL); 58*4882a593Smuzhiyun return(FH_ERROR_OK); 59*4882a593Smuzhiyun break; 60*4882a593Smuzhiyun case EXTENSION_RECORD_TYPE: 61*4882a593Smuzhiyun@@ -210,7 +210,7 @@ 62*4882a593Smuzhiyun } 63*4882a593Smuzhiyun } 64*4882a593Smuzhiyun while( rt!= TERMINATE_RECORD_TYPE ); 65*4882a593Smuzhiyun- DGifCloseFile(gft); 66*4882a593Smuzhiyun+ DGifCloseFile(gft, NULL); 67*4882a593Smuzhiyun return(FH_ERROR_FORMAT); 68*4882a593Smuzhiyun } 69*4882a593Smuzhiyun #endif 70*4882a593Smuzhiyundiff -uNr fbv-1.0b.org/configure fbv-1.0b/configure 71*4882a593Smuzhiyun--- fbv-1.0b.org/configure 2004-09-07 13:29:27.000000000 +0200 72*4882a593Smuzhiyun+++ fbv-1.0b/configure 2015-01-29 19:58:30.374599874 +0100 73*4882a593Smuzhiyun@@ -106,9 +106,9 @@ 74*4882a593Smuzhiyun ungif="no" 75*4882a593Smuzhiyun echo "libungif check" >>./config.log 76*4882a593Smuzhiyun echo " 1st:" >>./config.log 77*4882a593Smuzhiyun-$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs 78*4882a593Smuzhiyun+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lgif $libs 79*4882a593Smuzhiyun if [ -e \$\$~test ]; then 80*4882a593Smuzhiyun- libs="-lungif $libs" ; ungif="yes" 81*4882a593Smuzhiyun+ libs="-lgif $libs" ; ungif="yes" 82*4882a593Smuzhiyun else 83*4882a593Smuzhiyun echo " 2nd: -lX11 -L$xdir/lib" >>./config.log 84*4882a593Smuzhiyun $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs 85