[arch-commits] Commit in leptonica/repos (8 files)

Sergej Pupykin spupykin at archlinux.org
Tue Jan 10 17:07:07 UTC 2017


    Date: Tuesday, January 10, 2017 @ 17:07:06
  Author: spupykin
Revision: 206600

archrelease: copy trunk to community-i686, community-x86_64

Added:
  leptonica/repos/community-i686/PKGBUILD
    (from rev 206599, leptonica/trunk/PKGBUILD)
  leptonica/repos/community-i686/giflib6.patch
    (from rev 206599, leptonica/trunk/giflib6.patch)
  leptonica/repos/community-x86_64/PKGBUILD
    (from rev 206599, leptonica/trunk/PKGBUILD)
  leptonica/repos/community-x86_64/giflib6.patch
    (from rev 206599, leptonica/trunk/giflib6.patch)
Deleted:
  leptonica/repos/community-i686/PKGBUILD
  leptonica/repos/community-i686/giflib6.patch
  leptonica/repos/community-x86_64/PKGBUILD
  leptonica/repos/community-x86_64/giflib6.patch

--------------------------------+
 /PKGBUILD                      |   66 +++++++++++
 /giflib6.patch                 |  222 +++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD        |   33 -----
 community-i686/giflib6.patch   |  111 -------------------
 community-x86_64/PKGBUILD      |   33 -----
 community-x86_64/giflib6.patch |  111 -------------------
 6 files changed, 288 insertions(+), 288 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-01-10 17:06:48 UTC (rev 206599)
+++ community-i686/PKGBUILD	2017-01-10 17:07:06 UTC (rev 206600)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Christoph Drexler <chrdr at gmx dot at>
-
-pkgname=leptonica
-pkgver=1.73
-pkgrel=1
-pkgdesc="Software that is broadly useful for image processing and image analysis applications"
-arch=('i686' 'x86_64')
-url="http://www.leptonica.com/"
-license=('custom')
-depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
-source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
-	giflib6.patch)
-md5sums=('092cea2e568cada79fff178820397922'
-         'deeea9d5dccd9a0fb4e0e4433db49086')
-
-prepare() {
-  cd ${srcdir}/leptonica-${pkgver}
-#  patch -p1 <$srcdir/giflib6.patch
-}
-
-build() {
-  cd ${srcdir}/leptonica-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/leptonica-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt
-}

Copied: leptonica/repos/community-i686/PKGBUILD (from rev 206599, leptonica/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-01-10 17:07:06 UTC (rev 206600)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Christoph Drexler <chrdr at gmx dot at>
+
+pkgname=leptonica
+pkgver=1.74
+pkgrel=1
+pkgdesc="Software that is broadly useful for image processing and image analysis applications"
+arch=('i686' 'x86_64')
+url="http://www.leptonica.com/"
+license=('custom')
+depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
+source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
+	giflib6.patch)
+sha256sums=('e170f8a3f79e7f1742aff975ad5bb0c4a124df1532e6e38d9d71aaa5111de5a2'
+            '5a2e2d3848a61688fde0465102727767d52a3b2489818e6855970f12e0cb9faa')
+
+prepare() {
+  cd "$srcdir"/leptonica-${pkgver}
+#  patch -p1 <"$srcdir"/giflib6.patch
+}
+
+build() {
+  cd "$srcdir"/leptonica-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir"/leptonica-${pkgver}
+  make DESTDIR="$pkgdir" install
+  install -D leptonica-license.txt "$pkgdir"/usr/share/licenses/leptonica/leptonica-license.txt
+}

Deleted: community-i686/giflib6.patch
===================================================================
--- community-i686/giflib6.patch	2017-01-10 17:06:48 UTC (rev 206599)
+++ community-i686/giflib6.patch	2017-01-10 17:07:06 UTC (rev 206600)
@@ -1,111 +0,0 @@
-diff -wbBur leptonica-1.70/src/gifio.c leptonica-1.70.my/src/gifio.c
---- leptonica-1.70/src/gifio.c	2013-11-24 01:57:40.000000000 +0400
-+++ leptonica-1.70.my/src/gifio.c	2014-06-09 14:07:31.031928421 +0400
-@@ -121,12 +121,12 @@
- 
-         /* Read all the data, but use only the first image found */
-     if (DGifSlurp(gif) != GIF_OK) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("failed to read GIF data", procName, NULL);
-     }
- 
-     if (gif->SavedImages == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("no images found in GIF", procName, NULL);
-     }
- 
-@@ -134,12 +134,12 @@
-     w = si.ImageDesc.Width;
-     h = si.ImageDesc.Height;
-     if (w <= 0 || h <= 0) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("invalid image dimensions", procName, NULL);
-     }
- 
-     if (si.RasterBits == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("no raster data in GIF", procName, NULL);
-     }
- 
-@@ -151,7 +151,7 @@
-         gif_cmap = gif->SColorMap;
-     } else {
-             /* don't know where to take cmap from */
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("color map is missing", procName, NULL);
-     }
- 
-@@ -175,7 +175,7 @@
-     }
- 
-     if ((pixd = pixCreate(w, h, d)) == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         pixcmapDestroy(&cmap);
-         return (PIX *)ERROR_PTR("failed to allocate pixd", procName, NULL);
-     }
-@@ -207,7 +207,7 @@
-         pixTransferAllData(pixd, &pixdi, 0, 0);
-     }
- 
--    DGifCloseFile(gif);
-+    DGifCloseFile(gif, NULL);
-     return pixd;
- }
- 
-@@ -356,14 +356,14 @@
-         != GIF_OK) {
-         pixDestroy(&pixd);
-         GifFreeMapObject(gif_cmap);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("failed to write screen description", procName, 1);
-     }
-     GifFreeMapObject(gif_cmap); /* not needed after this point */
- 
-     if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("failed to image screen description", procName, 1);
-     }
- 
-@@ -371,13 +371,13 @@
-     wpl = pixGetWpl(pixd);
-     if (d != 1 && d != 2 && d != 4 && d != 8) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("image depth is not in {1, 2, 4, 8}", procName, 1);
-     }
- 
-     if ((gif_line = (GifByteType *)CALLOC(sizeof(GifByteType), w)) == NULL) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("mem alloc fail for data line", procName, 1);
-     }
- 
-@@ -406,7 +406,7 @@
-         if (EGifPutLine(gif, gif_line, w) != GIF_OK) {
-             FREE(gif_line);
-             pixDestroy(&pixd);
--            EGifCloseFile(gif);
-+            EGifCloseFile(gif, NULL);
-             return ERROR_INT("failed to write data line into GIF", procName, 1);
-         }
-     }
-@@ -422,7 +422,7 @@
- 
-     FREE(gif_line);
-     pixDestroy(&pixd);
--    EGifCloseFile(gif);
-+    EGifCloseFile(gif, NULL);
-     return 0;
- }
- 

Copied: leptonica/repos/community-i686/giflib6.patch (from rev 206599, leptonica/trunk/giflib6.patch)
===================================================================
--- community-i686/giflib6.patch	                        (rev 0)
+++ community-i686/giflib6.patch	2017-01-10 17:07:06 UTC (rev 206600)
@@ -0,0 +1,111 @@
+diff -wbBur leptonica-1.70/src/gifio.c leptonica-1.70.my/src/gifio.c
+--- leptonica-1.70/src/gifio.c	2013-11-24 01:57:40.000000000 +0400
++++ leptonica-1.70.my/src/gifio.c	2014-06-09 14:07:31.031928421 +0400
+@@ -121,12 +121,12 @@
+ 
+         /* Read all the data, but use only the first image found */
+     if (DGifSlurp(gif) != GIF_OK) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("failed to read GIF data", procName, NULL);
+     }
+ 
+     if (gif->SavedImages == NULL) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("no images found in GIF", procName, NULL);
+     }
+ 
+@@ -134,12 +134,12 @@
+     w = si.ImageDesc.Width;
+     h = si.ImageDesc.Height;
+     if (w <= 0 || h <= 0) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("invalid image dimensions", procName, NULL);
+     }
+ 
+     if (si.RasterBits == NULL) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("no raster data in GIF", procName, NULL);
+     }
+ 
+@@ -151,7 +151,7 @@
+         gif_cmap = gif->SColorMap;
+     } else {
+             /* don't know where to take cmap from */
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("color map is missing", procName, NULL);
+     }
+ 
+@@ -175,7 +175,7 @@
+     }
+ 
+     if ((pixd = pixCreate(w, h, d)) == NULL) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         pixcmapDestroy(&cmap);
+         return (PIX *)ERROR_PTR("failed to allocate pixd", procName, NULL);
+     }
+@@ -207,7 +207,7 @@
+         pixTransferAllData(pixd, &pixdi, 0, 0);
+     }
+ 
+-    DGifCloseFile(gif);
++    DGifCloseFile(gif, NULL);
+     return pixd;
+ }
+ 
+@@ -356,14 +356,14 @@
+         != GIF_OK) {
+         pixDestroy(&pixd);
+         GifFreeMapObject(gif_cmap);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("failed to write screen description", procName, 1);
+     }
+     GifFreeMapObject(gif_cmap); /* not needed after this point */
+ 
+     if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
+         pixDestroy(&pixd);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("failed to image screen description", procName, 1);
+     }
+ 
+@@ -371,13 +371,13 @@
+     wpl = pixGetWpl(pixd);
+     if (d != 1 && d != 2 && d != 4 && d != 8) {
+         pixDestroy(&pixd);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("image depth is not in {1, 2, 4, 8}", procName, 1);
+     }
+ 
+     if ((gif_line = (GifByteType *)CALLOC(sizeof(GifByteType), w)) == NULL) {
+         pixDestroy(&pixd);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("mem alloc fail for data line", procName, 1);
+     }
+ 
+@@ -406,7 +406,7 @@
+         if (EGifPutLine(gif, gif_line, w) != GIF_OK) {
+             FREE(gif_line);
+             pixDestroy(&pixd);
+-            EGifCloseFile(gif);
++            EGifCloseFile(gif, NULL);
+             return ERROR_INT("failed to write data line into GIF", procName, 1);
+         }
+     }
+@@ -422,7 +422,7 @@
+ 
+     FREE(gif_line);
+     pixDestroy(&pixd);
+-    EGifCloseFile(gif);
++    EGifCloseFile(gif, NULL);
+     return 0;
+ }
+ 

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-01-10 17:06:48 UTC (rev 206599)
+++ community-x86_64/PKGBUILD	2017-01-10 17:07:06 UTC (rev 206600)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Christoph Drexler <chrdr at gmx dot at>
-
-pkgname=leptonica
-pkgver=1.73
-pkgrel=1
-pkgdesc="Software that is broadly useful for image processing and image analysis applications"
-arch=('i686' 'x86_64')
-url="http://www.leptonica.com/"
-license=('custom')
-depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
-source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
-	giflib6.patch)
-md5sums=('092cea2e568cada79fff178820397922'
-         'deeea9d5dccd9a0fb4e0e4433db49086')
-
-prepare() {
-  cd ${srcdir}/leptonica-${pkgver}
-#  patch -p1 <$srcdir/giflib6.patch
-}
-
-build() {
-  cd ${srcdir}/leptonica-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/leptonica-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt
-}

Copied: leptonica/repos/community-x86_64/PKGBUILD (from rev 206599, leptonica/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-01-10 17:07:06 UTC (rev 206600)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Christoph Drexler <chrdr at gmx dot at>
+
+pkgname=leptonica
+pkgver=1.74
+pkgrel=1
+pkgdesc="Software that is broadly useful for image processing and image analysis applications"
+arch=('i686' 'x86_64')
+url="http://www.leptonica.com/"
+license=('custom')
+depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
+source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
+	giflib6.patch)
+sha256sums=('e170f8a3f79e7f1742aff975ad5bb0c4a124df1532e6e38d9d71aaa5111de5a2'
+            '5a2e2d3848a61688fde0465102727767d52a3b2489818e6855970f12e0cb9faa')
+
+prepare() {
+  cd "$srcdir"/leptonica-${pkgver}
+#  patch -p1 <"$srcdir"/giflib6.patch
+}
+
+build() {
+  cd "$srcdir"/leptonica-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir"/leptonica-${pkgver}
+  make DESTDIR="$pkgdir" install
+  install -D leptonica-license.txt "$pkgdir"/usr/share/licenses/leptonica/leptonica-license.txt
+}

Deleted: community-x86_64/giflib6.patch
===================================================================
--- community-x86_64/giflib6.patch	2017-01-10 17:06:48 UTC (rev 206599)
+++ community-x86_64/giflib6.patch	2017-01-10 17:07:06 UTC (rev 206600)
@@ -1,111 +0,0 @@
-diff -wbBur leptonica-1.70/src/gifio.c leptonica-1.70.my/src/gifio.c
---- leptonica-1.70/src/gifio.c	2013-11-24 01:57:40.000000000 +0400
-+++ leptonica-1.70.my/src/gifio.c	2014-06-09 14:07:31.031928421 +0400
-@@ -121,12 +121,12 @@
- 
-         /* Read all the data, but use only the first image found */
-     if (DGifSlurp(gif) != GIF_OK) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("failed to read GIF data", procName, NULL);
-     }
- 
-     if (gif->SavedImages == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("no images found in GIF", procName, NULL);
-     }
- 
-@@ -134,12 +134,12 @@
-     w = si.ImageDesc.Width;
-     h = si.ImageDesc.Height;
-     if (w <= 0 || h <= 0) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("invalid image dimensions", procName, NULL);
-     }
- 
-     if (si.RasterBits == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("no raster data in GIF", procName, NULL);
-     }
- 
-@@ -151,7 +151,7 @@
-         gif_cmap = gif->SColorMap;
-     } else {
-             /* don't know where to take cmap from */
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("color map is missing", procName, NULL);
-     }
- 
-@@ -175,7 +175,7 @@
-     }
- 
-     if ((pixd = pixCreate(w, h, d)) == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         pixcmapDestroy(&cmap);
-         return (PIX *)ERROR_PTR("failed to allocate pixd", procName, NULL);
-     }
-@@ -207,7 +207,7 @@
-         pixTransferAllData(pixd, &pixdi, 0, 0);
-     }
- 
--    DGifCloseFile(gif);
-+    DGifCloseFile(gif, NULL);
-     return pixd;
- }
- 
-@@ -356,14 +356,14 @@
-         != GIF_OK) {
-         pixDestroy(&pixd);
-         GifFreeMapObject(gif_cmap);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("failed to write screen description", procName, 1);
-     }
-     GifFreeMapObject(gif_cmap); /* not needed after this point */
- 
-     if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("failed to image screen description", procName, 1);
-     }
- 
-@@ -371,13 +371,13 @@
-     wpl = pixGetWpl(pixd);
-     if (d != 1 && d != 2 && d != 4 && d != 8) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("image depth is not in {1, 2, 4, 8}", procName, 1);
-     }
- 
-     if ((gif_line = (GifByteType *)CALLOC(sizeof(GifByteType), w)) == NULL) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("mem alloc fail for data line", procName, 1);
-     }
- 
-@@ -406,7 +406,7 @@
-         if (EGifPutLine(gif, gif_line, w) != GIF_OK) {
-             FREE(gif_line);
-             pixDestroy(&pixd);
--            EGifCloseFile(gif);
-+            EGifCloseFile(gif, NULL);
-             return ERROR_INT("failed to write data line into GIF", procName, 1);
-         }
-     }
-@@ -422,7 +422,7 @@
- 
-     FREE(gif_line);
-     pixDestroy(&pixd);
--    EGifCloseFile(gif);
-+    EGifCloseFile(gif, NULL);
-     return 0;
- }
- 

Copied: leptonica/repos/community-x86_64/giflib6.patch (from rev 206599, leptonica/trunk/giflib6.patch)
===================================================================
--- community-x86_64/giflib6.patch	                        (rev 0)
+++ community-x86_64/giflib6.patch	2017-01-10 17:07:06 UTC (rev 206600)
@@ -0,0 +1,111 @@
+diff -wbBur leptonica-1.70/src/gifio.c leptonica-1.70.my/src/gifio.c
+--- leptonica-1.70/src/gifio.c	2013-11-24 01:57:40.000000000 +0400
++++ leptonica-1.70.my/src/gifio.c	2014-06-09 14:07:31.031928421 +0400
+@@ -121,12 +121,12 @@
+ 
+         /* Read all the data, but use only the first image found */
+     if (DGifSlurp(gif) != GIF_OK) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("failed to read GIF data", procName, NULL);
+     }
+ 
+     if (gif->SavedImages == NULL) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("no images found in GIF", procName, NULL);
+     }
+ 
+@@ -134,12 +134,12 @@
+     w = si.ImageDesc.Width;
+     h = si.ImageDesc.Height;
+     if (w <= 0 || h <= 0) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("invalid image dimensions", procName, NULL);
+     }
+ 
+     if (si.RasterBits == NULL) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("no raster data in GIF", procName, NULL);
+     }
+ 
+@@ -151,7 +151,7 @@
+         gif_cmap = gif->SColorMap;
+     } else {
+             /* don't know where to take cmap from */
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         return (PIX *)ERROR_PTR("color map is missing", procName, NULL);
+     }
+ 
+@@ -175,7 +175,7 @@
+     }
+ 
+     if ((pixd = pixCreate(w, h, d)) == NULL) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         pixcmapDestroy(&cmap);
+         return (PIX *)ERROR_PTR("failed to allocate pixd", procName, NULL);
+     }
+@@ -207,7 +207,7 @@
+         pixTransferAllData(pixd, &pixdi, 0, 0);
+     }
+ 
+-    DGifCloseFile(gif);
++    DGifCloseFile(gif, NULL);
+     return pixd;
+ }
+ 
+@@ -356,14 +356,14 @@
+         != GIF_OK) {
+         pixDestroy(&pixd);
+         GifFreeMapObject(gif_cmap);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("failed to write screen description", procName, 1);
+     }
+     GifFreeMapObject(gif_cmap); /* not needed after this point */
+ 
+     if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
+         pixDestroy(&pixd);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("failed to image screen description", procName, 1);
+     }
+ 
+@@ -371,13 +371,13 @@
+     wpl = pixGetWpl(pixd);
+     if (d != 1 && d != 2 && d != 4 && d != 8) {
+         pixDestroy(&pixd);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("image depth is not in {1, 2, 4, 8}", procName, 1);
+     }
+ 
+     if ((gif_line = (GifByteType *)CALLOC(sizeof(GifByteType), w)) == NULL) {
+         pixDestroy(&pixd);
+-        EGifCloseFile(gif);
++        EGifCloseFile(gif, NULL);
+         return ERROR_INT("mem alloc fail for data line", procName, 1);
+     }
+ 
+@@ -406,7 +406,7 @@
+         if (EGifPutLine(gif, gif_line, w) != GIF_OK) {
+             FREE(gif_line);
+             pixDestroy(&pixd);
+-            EGifCloseFile(gif);
++            EGifCloseFile(gif, NULL);
+             return ERROR_INT("failed to write data line into GIF", procName, 1);
+         }
+     }
+@@ -422,7 +422,7 @@
+ 
+     FREE(gif_line);
+     pixDestroy(&pixd);
+-    EGifCloseFile(gif);
++    EGifCloseFile(gif, NULL);
+     return 0;
+ }
+ 



More information about the arch-commits mailing list