-
Notifications
You must be signed in to change notification settings - Fork 58
/
giflib-4.2-fix.patch
56 lines (47 loc) · 1.35 KB
/
giflib-4.2-fix.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
From 6bb02ebe1b79ac6cdb92766526051902c8114e89 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john.hawthorn@gmail.com>
Date: Wed, 15 May 2013 05:21:07 -0700
Subject: [PATCH] fix compilation with giflib >= 4.2.0
---
src/gif.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/gif.c b/src/gif.c
index 7c55209..61b30a9 100644
--- a/src/gif.c
+++ b/src/gif.c
@@ -56,10 +56,8 @@ static int gif_read(struct image *img){
GifColorType *colormap;
SavedImage *s;
- if(DGifSlurp(g->gif) == GIF_ERROR){
- PrintGifError();
- return 1;
- }
+ if(DGifSlurp(g->gif) == GIF_ERROR)
+ goto error;
s = &g->gif->SavedImages[0];
@@ -67,10 +65,8 @@ static int gif_read(struct image *img){
colormap = s->ImageDesc.ColorMap->Colors;
else if(g->gif->SColorMap)
colormap = g->gif->SColorMap->Colors;
- else{
- PrintGifError();
- return 1;
- }
+ else
+ goto error;
for(i = 0; i < img->bufwidth * img->bufheight; i++){
unsigned char idx = s->RasterBits[i];
@@ -82,6 +78,13 @@ static int gif_read(struct image *img){
img->state |= LOADED | SLOWLOADED;
return 0;
+error:
+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
+ fprintf(stderr, "%s\n", GifErrorString());
+#else
+ PrintGifError();
+#endif
+ return 1;
}
void gif_close(struct image *img){
--
1.8.1.6