dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

multiple libgif versions support for gif2webp

Browse Source 
Make it work for libgif v5.0+, for which a couple of APIs have changed.

Change-Id: I6dd49bb5bf1b60f96f3a164d58ef2ef19281c96b
This commit is contained in:
Urvang Joshi 2013-01-08 11:52:24 -08:00
parent 476e293fe8
commit 8b650635df
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
examples/gif2webp.c
View File

@ -132,6 +132,26 @@ static int GetColorFromIndex(const ColorMapObject* const color_map, GifWord idx,
} }
} }
static void DisplayGifError(const GifFileType* const 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)
#if GIFLIB_MAJOR >= 5
// Static string actually, hence the const char* cast.
const char* error_str = (const char*)GifErrorString(gif->Error);
#else
const char* error_str = (const char*)GifErrorString();
#endif
if (error_str == NULL) error_str = "Unknown error";
fprintf(stderr, "GIFLib Error: %s\n", error_str);
#else
fprintf(stderr, "GIFLib Error: ");
PrintGifError();
fprintf(stderr, "\n");
#endif
}
static const char* const kErrorMessages[] = { static const char* const kErrorMessages[] = {
"WEBP_MUX_NOT_FOUND", "WEBP_MUX_INVALID_ARGUMENT", "WEBP_MUX_BAD_DATA", "WEBP_MUX_NOT_FOUND", "WEBP_MUX_INVALID_ARGUMENT", "WEBP_MUX_BAD_DATA",
"WEBP_MUX_MEMORY_ERROR", "WEBP_MUX_NOT_ENOUGH_DATA" "WEBP_MUX_MEMORY_ERROR", "WEBP_MUX_NOT_ENOUGH_DATA"
@ -241,7 +261,12 @@ int main(int argc, const char *argv[]) {
} }
// Start the decoder object // Start the decoder object
#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
// There was an API change in version 5.0.0.
gif = DGifOpenFileName(in_file, &gif_error);
#else
gif = DGifOpenFileName(in_file); gif = DGifOpenFileName(in_file);
#endif
if (gif == NULL) goto End; if (gif == NULL) goto End;
// Allocate picture buffer // Allocate picture buffer
@ -437,7 +462,7 @@ int main(int argc, const char *argv[]) {
if (out != NULL && out_file != NULL) fclose(out); if (out != NULL && out_file != NULL) fclose(out);
if (gif_error != 0) { if (gif_error != 0) {
PrintGifError(); DisplayGifError(gif);
} }
if (gif != NULL) { if (gif != NULL) {
DGifCloseFile(gif); DGifCloseFile(gif);