[Midnightbsd-cvs] mports [21245] trunk/graphics/imlib2/files/ patch-src_modules_loaders_loader__gif.c: fix build with giflib 5.1

[laffer1 at midnightbsd.org]

Revision: 21245
          http://svnweb.midnightbsd.org/mports/?rev=21245
Author:   laffer1
Date:     2016-03-22 18:46:22 -0400 (Tue, 22 Mar 2016)
Log Message:
-----------
fix build with giflib 5.1

Modified Paths:
--------------
    trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c

Modified: trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c
===================================================================
--- trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c	2016-03-22 22:31:12 UTC (rev 21244)
+++ trunk/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c	2016-03-22 22:46:22 UTC (rev 21245)
@@ -12,3 +12,73 @@
     if (!gif)
       {
          close(fd);
+@@ -60,13 +64,21 @@ load(ImlibImage * im, ImlibProgressFunct
+              h = gif->Image.Height;
+              if (!IMAGE_DIMENSIONS_OK(w, h))
+                {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++                  DGifCloseFile(gif, NULL);
++#else
+                   DGifCloseFile(gif);
++#endif
+                   return 0;
+                }
+              rows = malloc(h * sizeof(GifRowType *));
+              if (!rows)
+                {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++                  DGifCloseFile(gif, NULL);
++#else
+                   DGifCloseFile(gif);
++#endif
+                   return 0;
+                }
+              for (i = 0; i < h; i++)
+@@ -78,7 +90,11 @@ load(ImlibImage * im, ImlibProgressFunct
+                   rows[i] = malloc(w * sizeof(GifPixelType));
+                   if (!rows[i])
+                     {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++                       DGifCloseFile(gif, NULL);
++#else
+                        DGifCloseFile(gif);
++#endif
+                        for (i = 0; i < h; i++)
+                          {
+                             if (rows[i])
+@@ -150,7 +166,11 @@ load(ImlibImage * im, ImlibProgressFunct
+         im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
+         if (!im->data)
+           {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++             DGifCloseFile(gif, NULL);
++#else
+              DGifCloseFile(gif);
++#endif
+              free(rows);
+              return 0;
+           }
+@@ -181,7 +201,11 @@ load(ImlibImage * im, ImlibProgressFunct
+                        last_per = (int)per;
+                        if (!(progress(im, (int)per, 0, last_y, w, i)))
+                          {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++                            DGifCloseFile(gif, NULL);
++#else
+                             DGifCloseFile(gif);
++#endif
+                             for (i = 0; i < h; i++)
+                               {
+                                  free(rows[i]);
+@@ -198,7 +222,11 @@ load(ImlibImage * im, ImlibProgressFunct
+      {
+         progress(im, 100, 0, last_y, w, h);
+      }
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++   DGifCloseFile(gif, NULL);
++#else
+    DGifCloseFile(gif);
++#endif
+    for (i = 0; i < h; i++)
+      {
+         free(rows[i]);