File imlib1-1.9.15-fix_giflib5_support.patch of Package imlib1

Overview Repositories Revisions Requests Users Attributes Meta

File imlib1-1.9.15-fix_giflib5_support.patch of Package imlib1 (Revision a3692b0508adf8dd315830eb5368465e)

Currently displaying revision a3692b0508adf8dd315830eb5368465e , Show latest

--- imlib-1.9.15/Imlib/load.c.giflib5	2013-08-24 22:33:29.101850691 +0200
+++ imlib-1.9.15/Imlib/load.c	2013-08-24 22:34:39.139368620 +0200
@@ -8,16 +8,28 @@
 
 /* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */ 
 /* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */ 
-#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ 
-        ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) 
+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
+        ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
+#if GIFLIB_MAJOR > 4
+static void PrintGifError(int ErrorCode)
+#else
 static void PrintGifError(void)
+#endif
 {
+#if GIFLIB_MAJOR > 4
+  char *Err = GifErrorString(ErrorCode);
+#else
   char *Err = GifErrorString();
+#endif
 
   if (Err != NULL) {
     fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
   } else {
+#if GIFLIB_MAJOR > 4
+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", ErrorCode);
+#else
     fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
+#endif
   }
 } 
 #endif 
@@ -467,7 +479,13 @@
   fd = fileno(f);
   /* Apparently rewind(f) isn't sufficient */
   lseek(fd, (long) 0, 0);
+  
+#if GIFLIB_MAJOR > 4
+  int ErrorCode;
+  gif = DGifOpenFileHandle(fd, &ErrorCode);
+#else
   gif = DGifOpenFileHandle(fd);
+#endif
 
   if (!gif)
     return NULL;
@@ -475,14 +493,22 @@
     {
       if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
 	{
+#if GIFLIB_MAJOR > 4
+	  PrintGifError(gif->Error);
+#else
 	  PrintGifError();
+#endif
 	  rec = TERMINATE_RECORD_TYPE;
 	}
       if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
 	{
 	  if (DGifGetImageDesc(gif) == GIF_ERROR)
 	    {
+#if GIFLIB_MAJOR > 4
+	      PrintGifError(gif->Error);
+#else
 	      PrintGifError();
+#endif
 	      rec = TERMINATE_RECORD_TYPE;
 	    }
 	  *w = gif->Image.Width;

Places

File imlib1-1.9.15-fix_giflib5_support.patch of Package imlib1 (Revision a3692b0508adf8dd315830eb5368465e)

Places