[packages/imlib2] - let it work with giflib 5.0.x

qboosh qboosh at pld-linux.org
Wed Jan 7 16:55:01 CET 2015


commit 842f1866d2e552c69fcbade722183fbc23545116
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 7 16:56:21 2015 +0100

    - let it work with giflib 5.0.x

 giflib5.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/giflib5.patch b/giflib5.patch
index 7f48cd5..9b58029 100644
--- a/giflib5.patch
+++ b/giflib5.patch
@@ -16,7 +16,7 @@
               h = gif->Image.Height;
  	     if (!IMAGE_DIMENSIONS_OK(w, h))
  	       {
-+#if GIFLIB_MAJOR >= 5
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +                  DGifCloseFile(gif, NULL);
 +#else
                    DGifCloseFile(gif);
@@ -26,7 +26,7 @@
               rows = malloc(h * sizeof(GifRowType *));
               if (!rows)
                 {
-+#if GIFLIB_MAJOR >= 5
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +                  DGifCloseFile(gif, NULL);
 +#else
                    DGifCloseFile(gif);
@@ -38,7 +38,7 @@
                    rows[i] = malloc(w * sizeof(GifPixelType));
                    if (!rows[i])
                      {
-+#if GIFLIB_MAJOR >= 5
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +                       DGifCloseFile(gif, NULL);
 +#else
                         DGifCloseFile(gif);
@@ -50,7 +50,7 @@
          im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
          if (!im->data)
            {
-+#if GIFLIB_MAJOR >= 5
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +             DGifCloseFile(gif, NULL);
 +#else
               DGifCloseFile(gif);
@@ -62,7 +62,7 @@
                         last_per = (int)per;
                         if (!(progress(im, (int)per, 0, last_y, w, i)))
                           {
-+#if GIFLIB_MAJOR >= 5
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +                            DGifCloseFile(gif, NULL);
 +#else
                              DGifCloseFile(gif);
@@ -74,7 +74,7 @@
       {
          progress(im, 100, 0, last_y, w, h);
       }
-+#if GIFLIB_MAJOR >= 5
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +   DGifCloseFile(gif, NULL);
 +#else
     DGifCloseFile(gif);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/imlib2.git/commitdiff/842f1866d2e552c69fcbade722183fbc23545116



More information about the pld-cvs-commit mailing list