|
Lines 25-31
Link Here
|
| 25 |
if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { |
25 |
if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { |
| 26 |
if (debug) |
26 |
if (debug) |
| 27 |
fprintf(stderr,"gif: DGifGetRecordType failed\n"); |
27 |
fprintf(stderr,"gif: DGifGetRecordType failed\n"); |
|
|
28 |
#if GIFLIB_MAJOR >= 5 |
| 29 |
GifErrorString((NULL)); |
| 30 |
#else |
| 28 |
GifErrorString(); |
31 |
GifErrorString(); |
|
|
32 |
#endif |
| 29 |
return -1; |
33 |
return -1; |
| 30 |
} |
34 |
} |
| 31 |
switch (RecordType) { |
35 |
switch (RecordType) { |
|
Lines 42-48
Link Here
|
| 42 |
if (rc == GIF_ERROR) { |
46 |
if (rc == GIF_ERROR) { |
| 43 |
if (debug) |
47 |
if (debug) |
| 44 |
fprintf(stderr,"gif: DGifGetExtension failed\n"); |
48 |
fprintf(stderr,"gif: DGifGetExtension failed\n"); |
|
|
49 |
#if GIFLIB_MAJOR >= 5 |
| 50 |
GifErrorString((NULL)); |
| 51 |
#else |
| 45 |
GifErrorString(); |
52 |
GifErrorString(); |
|
|
53 |
#endif |
| 46 |
return -1; |
54 |
return -1; |
| 47 |
} |
55 |
} |
| 48 |
if (debug) { |
56 |
if (debug) { |
|
Lines 98-104
Link Here
|
| 98 |
memset(h,0,sizeof(*h)); |
106 |
memset(h,0,sizeof(*h)); |
| 99 |
|
107 |
|
| 100 |
h->infile = fp; |
108 |
h->infile = fp; |
|
|
109 |
#if GIFLIB_MAJOR >= 5 |
| 110 |
h->gif = DGifOpenFileHandle(fileno(fp),NULL); |
| 111 |
#else |
| 101 |
h->gif = DGifOpenFileHandle(fileno(fp)); |
112 |
h->gif = DGifOpenFileHandle(fileno(fp)); |
|
|
113 |
#endif |
| 102 |
h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); |
114 |
h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); |
| 103 |
|
115 |
|
| 104 |
while (0 == image) { |
116 |
while (0 == image) { |
|
Lines 108-114
Link Here
|
| 108 |
if (GIF_ERROR == DGifGetImageDesc(h->gif)) { |
120 |
if (GIF_ERROR == DGifGetImageDesc(h->gif)) { |
| 109 |
if (debug) |
121 |
if (debug) |
| 110 |
fprintf(stderr,"gif: DGifGetImageDesc failed\n"); |
122 |
fprintf(stderr,"gif: DGifGetImageDesc failed\n"); |
|
|
123 |
#if GIFLIB_MAJOR >= 5 |
| 124 |
GifErrorString((NULL)); |
| 125 |
#else |
| 111 |
GifErrorString(); |
126 |
GifErrorString(); |
|
|
127 |
#endif |
| 112 |
} |
128 |
} |
| 113 |
if (NULL == h->gif->SColorMap && |
129 |
if (NULL == h->gif->SColorMap && |
| 114 |
NULL == h->gif->Image.ColorMap) { |
130 |
NULL == h->gif->Image.ColorMap) { |
