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
|
--- a/rd/read-gif.c
+++ b/rd/read-gif.c
@@ -25,7 +25,13 @@
if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
if (debug)
fprintf(stderr,"gif: DGifGetRecordType failed\n");
- PrintGifError();
+#if GIFLIB_MAJOR >= 5
+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE);
+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2)
+ GifErrorString();
+#else
+ PrintGifError();
+#endif
return -1;
}
switch (RecordType) {
@@ -42,7 +48,13 @@
if (rc == GIF_ERROR) {
if (debug)
fprintf(stderr,"gif: DGifGetExtension failed\n");
+#if GIFLIB_MAJOR >= 5
+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE);
+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2)
+ GifErrorString();
+#else
PrintGifError();
+#endif
return -1;
}
if (debug) {
@@ -93,12 +105,19 @@
struct gif_state *h;
GifRecordType RecordType;
int i, image = 0;
+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
+ int ErrorCode;
+#endif
h = malloc(sizeof(*h));
memset(h,0,sizeof(*h));
h->infile = fp;
+#if GIFLIB_MAJOR >= 5
+ h->gif = DGifOpenFileHandle(fileno(fp), NULL);
+#else
h->gif = DGifOpenFileHandle(fileno(fp));
+#endif
h->row = malloc(h->gif->SWidth * sizeof(GifPixelType));
while (0 == image) {
@@ -108,7 +127,15 @@
if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
if (debug)
fprintf(stderr,"gif: DGifGetImageDesc failed\n");
+#if (GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1)
+ GifErrorString(D_GIF_ERR_NO_IMAG_DSCR);
+#elif GIFLIB_MAJOR >= 5
+ GifErrorString(NULL);
+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2)
+ GifErrorString();
+#else
PrintGifError();
+#endif
}
if (NULL == h->gif->SColorMap &&
NULL == h->gif->Image.ColorMap) {
@@ -156,7 +183,11 @@
oops:
if (debug)
fprintf(stderr,"gif: fatal error, aborting\n");
+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
+ DGifCloseFile(h->gif, &ErrorCode);
+#else
DGifCloseFile(h->gif);
+#endif
fclose(h->infile);
free(h->row);
free(h);
@@ -193,10 +224,17 @@
gif_done(void *data)
{
struct gif_state *h = data;
+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
+ int ErrorCode;
+#endif
if (debug)
fprintf(stderr,"gif: done, cleaning up\n");
+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
+ DGifCloseFile(h->gif, &ErrorCode);
+#else
DGifCloseFile(h->gif);
+#endif
fclose(h->infile);
if (h->il)
free(h->il);
|
GitWeb