mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

pictureviewer/gif: fix build with giflib-5.1+

Browse Source
This commit is contained in:
Stefan Seyfried
2015-02-06 21:58:48 +01:00
committed by Jacek Jendrzej
parent 4e1678c2a3
commit 6b787d8d31
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/pictureviewer/gif.cpp
View File

@@ -14,14 +14,20 @@
extern "C" { extern "C" {
#include <gif_lib.h> #include <gif_lib.h>
} }
#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
#define DGIFCLOSEFILE(x) { int _error; DGifCloseFile(x, &_error); }
#else
#define DGIFCLOSEFILE(x) DGifCloseFile(x)
#endif
#include <signal.h> #include <signal.h>
#define min(a,b) ((a) < (b) ? (a) : (b)) #define min(a,b) ((a) < (b) ? (a) : (b))
#define gflush return(FH_ERROR_FILE); #define gflush return(FH_ERROR_FILE);
#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } #define grflush { DGIFCLOSEFILE(gft); return(FH_ERROR_FORMAT); }
#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); } #define mgrflush { free(lb); free(slb); DGIFCLOSEFILE(gft); return(FH_ERROR_FORMAT); }
#if 0
#define agflush return(FH_ERROR_FORMAT); #define agflush return(FH_ERROR_FORMAT);
#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } #define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
#endif
int fh_gif_id(const char *name) int fh_gif_id(const char *name)
{ {
@@ -123,7 +129,7 @@ int fh_gif_load(const char *name,unsigned char **buffer,int* /*xp*/,int* /*yp*/)
} }
} }
while( rt!= TERMINATE_RECORD_TYPE ); while( rt!= TERMINATE_RECORD_TYPE );
DGifCloseFile(gft); DGIFCLOSEFILE(gft);
return(FH_ERROR_OK); return(FH_ERROR_OK);
} }
int fh_gif_getsize(const char *name,int *x,int *y, int /*wanted_width*/, int /*wanted_height*/) int fh_gif_getsize(const char *name,int *x,int *y, int /*wanted_width*/, int /*wanted_height*/)
@@ -152,7 +158,7 @@ int fh_gif_getsize(const char *name,int *x,int *y, int /*wanted_width*/, int /*w
px=gft->Image.Width; px=gft->Image.Width;
py=gft->Image.Height; py=gft->Image.Height;
*x=px; *y=py; *x=px; *y=py;
DGifCloseFile(gft); DGIFCLOSEFILE(gft);
return(FH_ERROR_OK); return(FH_ERROR_OK);
break; break;
case EXTENSION_RECORD_TYPE: case EXTENSION_RECORD_TYPE:
@@ -165,7 +171,7 @@ int fh_gif_getsize(const char *name,int *x,int *y, int /*wanted_width*/, int /*w
} }
} }
while( rt!= TERMINATE_RECORD_TYPE ); while( rt!= TERMINATE_RECORD_TYPE );
DGifCloseFile(gft); DGIFCLOSEFILE(gft);
return(FH_ERROR_FORMAT); return(FH_ERROR_FORMAT);
} }
#endif #endif