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
|
From 0101157d4edd5d837d17356c66c7d25af7e020ac Mon Sep 17 00:00:00 2001
From: Sander Jansen <s.jansen@gmail.com>
Date: Wed, 19 Aug 2015 16:51:13 -0500
Subject: [PATCH] Fix compilation with gif_lib 5.1
---
mapimageio.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/mapimageio.c b/mapimageio.c
index e6bdcb5..5eed924 100644
--- a/mapimageio.c
+++ b/mapimageio.c
@@ -1058,6 +1058,13 @@ int readGIF(char *path, rasterBufferObj *rb)
} while (recordType != TERMINATE_RECORD_TYPE);
+
+#if defined GIFLIB_MAJOR && GIFLIB_MINOR && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR > 5))
+ if (DGifCloseFile(image, &errcode) == GIF_ERROR) {
+ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(errcode));
+ return MS_FAILURE;
+ }
+#else
if (DGifCloseFile(image) == GIF_ERROR) {
#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
@@ -1066,6 +1073,7 @@ int readGIF(char *path, rasterBufferObj *rb)
#endif
return MS_FAILURE;
}
+#endif
return MS_SUCCESS;
}
|
