[GNUnet-SVN] r23111 - Extractor/src/plugins

[gnunet]

Author: LRN
Date: 2012-08-05 13:12:52 +0200 (Sun, 05 Aug 2012)
New Revision: 23111

Modified:
   Extractor/src/plugins/gif_extractor.c
Log:
Giflib >= 5.0 compatibility

Modified: Extractor/src/plugins/gif_extractor.c
===================================================================
--- Extractor/src/plugins/gif_extractor.c       2012-08-05 09:46:49 UTC (rev 
23110)
+++ Extractor/src/plugins/gif_extractor.c       2012-08-05 11:12:52 UTC (rev 
23111)
@@ -63,9 +63,22 @@
   GifByteType *ext;
   int et;
   char dims[128];
+/* GIFLIB >= 5.0 does not define GIF_LIB_VERSION anymore */
+#if !defined (GIF_LIB_VERSION)
+  int gif_error;
   
+  gif_error = 0;
+  gif_file = DGifOpen (ec, &gif_read_func, &gif_error);
+  if (gif_file == NULL || gif_error != 0)
+  {
+    if (gif_file != NULL)
+      EGifCloseFile (gif_file);
+    return; /* not a GIF */
+  }
+#else
   if (NULL == (gif_file = DGifOpen (ec, &gif_read_func)))
     return; /* not a GIF */
+#endif
   if (0 !=
       ec->proc (ec->cls,
                "gif",