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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
--- image/gif.c.orig 2000-03-07 06:59:56 UTC
+++ image/gif.c
@@ -15,10 +15,31 @@
#ifdef USE_GIF
+#include <stdlib.h>
#include "image.h"
#include <gif_lib.h>
static void
+#if GIFLIB_MAJOR >= 5
+localPrintGifError(int ErrorCode)
+#else
+localPrintGifError(void)
+#endif
+{
+#if GIFLIB_MAJOR >= 5
+ char *Err = GifErrorString(ErrorCode);
+#else
+ char *Err = GifErrorString();
+ int ErrorCode = GifError();
+#endif
+
+ if (Err != NULL)
+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
+ else
+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", ErrorCode);
+}
+
+static void
tellAboutImage(name, gifp)
char *name;
GifFileType *gifp;
@@ -50,7 +71,11 @@ gifLoad(fullname, name, verbose)
ColorMapObject *ColorMap;
GifColorType *ColorMapEntry;
+#if GIFLIB_MAJOR >= 5
+ GifFile = DGifOpenFileName(fullname, NULL);
+#else
GifFile = DGifOpenFileName(fullname);
+#endif
if (GifFile == NULL)
return NULL;
@@ -87,13 +112,21 @@ gifLoad(fullname, name, verbose)
/* Scan the content of the GIF file and load the image(s) in: */
do {
if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
- PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ localPrintGifError(GifFile->Error);
+#else
+ localPrintGifError();
+#endif
exit(-1);
}
switch (RecordType) {
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
- PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ localPrintGifError(GifFile->Error);
+#else
+ localPrintGifError();
+#endif
exit(-1);
}
Row = GifFile->Image.Top; /* Image Position relative to Screen. */
@@ -113,7 +146,11 @@ gifLoad(fullname, name, verbose)
j += InterlacedJumps[i]) {
if (DGifGetLine(GifFile, &ScreenBuffer[j][Col],
Width) == GIF_ERROR) {
- PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ localPrintGifError(GifFile->Error);
+#else
+ localPrintGifError();
+#endif
exit(-1);
}
}
@@ -122,7 +159,11 @@ gifLoad(fullname, name, verbose)
for (i = 0; i < Height; i++) {
if (DGifGetLine(GifFile, &ScreenBuffer[Row++][Col],
Width) == GIF_ERROR) {
- PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ localPrintGifError(GifFile->Error);
+#else
+ localPrintGifError();
+#endif
exit(-1);
}
}
@@ -131,7 +172,11 @@ gifLoad(fullname, name, verbose)
case EXTENSION_RECORD_TYPE:
/* Skip any extension blocks in file: */
if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) {
- PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ localPrintGifError(GifFile->Error);
+#else
+ localPrintGifError();
+#endif
exit(-1);
}
/* very adhoc transparency support */
@@ -141,7 +186,11 @@ gifLoad(fullname, name, verbose)
}
while (Extension != NULL) {
if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
- PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ localPrintGifError(GifFile->Error);
+#else
+ localPrintGifError();
+#endif
exit(-1);
}
}
@@ -179,8 +228,16 @@ gifLoad(fullname, name, verbose)
pixline[x] = GifRow[x];
}
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
+#else
if (DGifCloseFile(GifFile) == GIF_ERROR) {
- PrintGifError();
+#endif
+#if GIFLIB_MAJOR >= 5
+ localPrintGifError(GifFile->Error);
+#else
+ localPrintGifError();
+#endif
exit(-1);
}
@@ -196,11 +253,19 @@ gifIdent(fullname, name)
GifFileType *gifp;
int ret;
+#if GIFLIB_MAJOR >= 5
+ gifp = DGifOpenFileName(fullname, NULL);
+#else
gifp = DGifOpenFileName(fullname);
+#endif
if (gifp == NULL)
ret = 0;
else {
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+ DGifCloseFile(gifp, NULL);
+#else
DGifCloseFile(gifp);
+#endif
tellAboutImage(name);
ret = 1;
}
|
