summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@inai.de>2014-09-09 15:09:28 +0200
committerMartyn Russell <martyn@lanedo.com>2014-09-19 10:21:35 +0100
commit2ad6b9063ff4d362b24c6f833ddb3e2be73f9e39 (patch)
treeda87cd0ebdfce0eefe46072c49ca332255fe2733
parent430c5b67e95323d1051a3354abb1a74a4fc3cba2 (diff)
downloadtracker-2ad6b9063ff4d362b24c6f833ddb3e2be73f9e39.tar.gz
tracker-extract-gif: add compatibility with GIFLib 5.1.0
Signed-off-by: Dominique Leuenberger <dimstar@opensuse.org> https://bugzilla.gnome.org/show_bug.cgi?id=736328
-rw-r--r--src/tracker-extract/tracker-extract-gif.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
index 43ba34a03..10f87dc74 100644
--- a/src/tracker-extract/tracker-extract-gif.c
+++ b/src/tracker-extract/tracker-extract-gif.c
@@ -96,6 +96,12 @@ static inline void print_gif_error()
}
#endif /* GIFLIB_MAJOR >= 5 */
+/* giflib 5.1 changed the API of DGifCloseFile to take two arguments */
+#if !defined(GIFLIB_MAJOR) || \
+ !(GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
+#define DGifCloseFile(a, b) DGifCloseFile(a)
+#endif
+
static void
read_metadata (TrackerSparqlBuilder *preupdate,
TrackerSparqlBuilder *metadata,
@@ -680,7 +686,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
g_free (uri);
- if (DGifCloseFile (gifFile) != GIF_OK) {
+ if (DGifCloseFile (gifFile, NULL) != GIF_OK) {
#if GIFLIB_MAJOR < 5
print_gif_error ();
#else /* GIFLIB_MAJOR < 5 */