[arch-commits] Commit in leptonica/trunk (PKGBUILD giflib6.patch)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Thu May 29 15:07:40 UTC 2014
Date: Thursday, May 29, 2014 @ 17:07:39
Author: spupykin
Revision: 112184
upgpkg: leptonica 1.69-11
upd
Modified:
leptonica/trunk/PKGBUILD
leptonica/trunk/giflib6.patch
---------------+
PKGBUILD | 4
giflib6.patch | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 230 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-29 15:07:36 UTC (rev 112183)
+++ PKGBUILD 2014-05-29 15:07:39 UTC (rev 112184)
@@ -4,7 +4,7 @@
pkgname=leptonica
pkgver=1.69
-pkgrel=10
+pkgrel=11
pkgdesc="Software that is broadly useful for image processing and image analysis applications"
arch=('i686' 'x86_64')
url="http://www.leptonica.com/"
@@ -13,7 +13,7 @@
source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
giflib6.patch)
md5sums=('d4085c302cbcab7f9af9d3d6f004ab22'
- 'f87e1b2c98107fe51544d4f4c44a9733')
+ '98735215ef76b14e4a573f25e5de93a6')
prepare() {
cd ${srcdir}/leptonica-${pkgver}
Modified: giflib6.patch
===================================================================
--- giflib6.patch 2014-05-29 15:07:36 UTC (rev 112183)
+++ giflib6.patch 2014-05-29 15:07:39 UTC (rev 112184)
@@ -1,7 +1,132 @@
-diff -wbBur leptonica-1.69/src/gifio.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c
+Only in leptonica-1.69.my: autom4te.cache
+Only in leptonica-1.69.my: config_auto.h
+Only in leptonica-1.69.my: config.log
+Only in leptonica-1.69.my: config.status
+Only in leptonica-1.69.my: libtool
+Only in leptonica-1.69.my: Makefile
+Only in leptonica-1.69.my/prog: .deps
+Only in leptonica-1.69.my/prog: Makefile
+Only in leptonica-1.69.my/src: adaptmap.lo
+Only in leptonica-1.69.my/src: adaptmap.o
+Only in leptonica-1.69.my/src: affinecompose.lo
+Only in leptonica-1.69.my/src: affinecompose.o
+Only in leptonica-1.69.my/src: affine.lo
+Only in leptonica-1.69.my/src: affine.o
+Only in leptonica-1.69.my/src: arithlow.lo
+Only in leptonica-1.69.my/src: arithlow.o
+Only in leptonica-1.69.my/src: arrayaccess.lo
+Only in leptonica-1.69.my/src: arrayaccess.o
+Only in leptonica-1.69.my/src: bardecode.lo
+Only in leptonica-1.69.my/src: bardecode.o
+Only in leptonica-1.69.my/src: baseline.lo
+Only in leptonica-1.69.my/src: baseline.o
+Only in leptonica-1.69.my/src: bbuffer.lo
+Only in leptonica-1.69.my/src: bbuffer.o
+Only in leptonica-1.69.my/src: bilinear.lo
+Only in leptonica-1.69.my/src: bilinear.o
+Only in leptonica-1.69.my/src: binarize.lo
+Only in leptonica-1.69.my/src: binarize.o
+Only in leptonica-1.69.my/src: binexpand.lo
+Only in leptonica-1.69.my/src: binexpandlow.lo
+Only in leptonica-1.69.my/src: binexpandlow.o
+Only in leptonica-1.69.my/src: binexpand.o
+Only in leptonica-1.69.my/src: binreduce.lo
+Only in leptonica-1.69.my/src: binreducelow.lo
+Only in leptonica-1.69.my/src: binreducelow.o
+Only in leptonica-1.69.my/src: binreduce.o
+Only in leptonica-1.69.my/src: blend.lo
+Only in leptonica-1.69.my/src: blend.o
+Only in leptonica-1.69.my/src: bmf.lo
+Only in leptonica-1.69.my/src: bmf.o
+Only in leptonica-1.69.my/src: bmpio.lo
+Only in leptonica-1.69.my/src: bmpio.o
+Only in leptonica-1.69.my/src: bmpiostub.lo
+Only in leptonica-1.69.my/src: bmpiostub.o
+Only in leptonica-1.69.my/src: boxbasic.lo
+Only in leptonica-1.69.my/src: boxbasic.o
+Only in leptonica-1.69.my/src: boxfunc1.lo
+Only in leptonica-1.69.my/src: boxfunc1.o
+Only in leptonica-1.69.my/src: boxfunc2.lo
+Only in leptonica-1.69.my/src: boxfunc2.o
+Only in leptonica-1.69.my/src: boxfunc3.lo
+Only in leptonica-1.69.my/src: boxfunc3.o
+Only in leptonica-1.69.my/src: boxfunc4.lo
+Only in leptonica-1.69.my/src: boxfunc4.o
+Only in leptonica-1.69.my/src: bytearray.lo
+Only in leptonica-1.69.my/src: bytearray.o
+Only in leptonica-1.69.my/src: ccbord.lo
+Only in leptonica-1.69.my/src: ccbord.o
+Only in leptonica-1.69.my/src: ccthin.lo
+Only in leptonica-1.69.my/src: ccthin.o
+Only in leptonica-1.69.my/src: classapp.lo
+Only in leptonica-1.69.my/src: classapp.o
+Only in leptonica-1.69.my/src: colorcontent.lo
+Only in leptonica-1.69.my/src: colorcontent.o
+Only in leptonica-1.69.my/src: coloring.lo
+Only in leptonica-1.69.my/src: coloring.o
+Only in leptonica-1.69.my/src: colormap.lo
+Only in leptonica-1.69.my/src: colormap.o
+Only in leptonica-1.69.my/src: colormorph.lo
+Only in leptonica-1.69.my/src: colormorph.o
+Only in leptonica-1.69.my/src: colorquant1.lo
+Only in leptonica-1.69.my/src: colorquant1.o
+Only in leptonica-1.69.my/src: colorquant2.lo
+Only in leptonica-1.69.my/src: colorquant2.o
+Only in leptonica-1.69.my/src: colorseg.lo
+Only in leptonica-1.69.my/src: colorseg.o
+Only in leptonica-1.69.my/src: colorspace.lo
+Only in leptonica-1.69.my/src: colorspace.o
+Only in leptonica-1.69.my/src: compare.lo
+Only in leptonica-1.69.my/src: compare.o
+Only in leptonica-1.69.my/src: conncomp.lo
+Only in leptonica-1.69.my/src: conncomp.o
+Only in leptonica-1.69.my/src: convertfiles.lo
+Only in leptonica-1.69.my/src: convertfiles.o
+Only in leptonica-1.69.my/src: convolve.lo
+Only in leptonica-1.69.my/src: convolvelow.lo
+Only in leptonica-1.69.my/src: convolvelow.o
+Only in leptonica-1.69.my/src: convolve.o
+Only in leptonica-1.69.my/src: correlscore.lo
+Only in leptonica-1.69.my/src: correlscore.o
+Only in leptonica-1.69.my/src: .deps
+Only in leptonica-1.69.my/src: dewarp.lo
+Only in leptonica-1.69.my/src: dewarp.o
+Only in leptonica-1.69.my/src: dnabasic.lo
+Only in leptonica-1.69.my/src: dnabasic.o
+Only in leptonica-1.69.my/src: dwacomb.2.lo
+Only in leptonica-1.69.my/src: dwacomb.2.o
+Only in leptonica-1.69.my/src: dwacomblow.2.lo
+Only in leptonica-1.69.my/src: dwacomblow.2.o
+Only in leptonica-1.69.my/src: edge.lo
+Only in leptonica-1.69.my/src: edge.o
+Only in leptonica-1.69.my/src: enhance.lo
+Only in leptonica-1.69.my/src: enhance.o
+Only in leptonica-1.69.my/src: fhmtauto.lo
+Only in leptonica-1.69.my/src: fhmtauto.o
+Only in leptonica-1.69.my/src: fhmtgen.1.lo
+Only in leptonica-1.69.my/src: fhmtgen.1.o
+Only in leptonica-1.69.my/src: fhmtgenlow.1.lo
+Only in leptonica-1.69.my/src: fhmtgenlow.1.o
+Only in leptonica-1.69.my/src: finditalic.lo
+Only in leptonica-1.69.my/src: finditalic.o
+Only in leptonica-1.69.my/src: flipdetect.lo
+Only in leptonica-1.69.my/src: flipdetect.o
+Only in leptonica-1.69.my/src: fliphmtgen.lo
+Only in leptonica-1.69.my/src: fliphmtgen.o
+Only in leptonica-1.69.my/src: fmorphauto.lo
+Only in leptonica-1.69.my/src: fmorphauto.o
+Only in leptonica-1.69.my/src: fmorphgen.1.lo
+Only in leptonica-1.69.my/src: fmorphgen.1.o
+Only in leptonica-1.69.my/src: fmorphgenlow.1.lo
+Only in leptonica-1.69.my/src: fmorphgenlow.1.o
+Only in leptonica-1.69.my/src: fpix1.lo
+Only in leptonica-1.69.my/src: fpix1.o
+Only in leptonica-1.69.my/src: fpix2.lo
+Only in leptonica-1.69.my/src: fpix2.o
+diff -wbBur leptonica-1.69/src/gifio.c leptonica-1.69.my/src/gifio.c
--- leptonica-1.69/src/gifio.c 2012-01-22 22:29:15.000000000 +0400
-+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c 2013-07-30 18:27:19.269137200 +0400
-@@ -100,7 +100,7 @@
++++ leptonica-1.69.my/src/gifio.c 2014-05-29 18:58:26.887319933 +0400
+@@ -100,18 +100,18 @@
_lseek(fd, 0, SEEK_SET);
#endif /* _MSC_VER */
@@ -10,6 +135,61 @@
return (PIX *)ERROR_PTR("invalid file or file not found",
procName, NULL);
+ /* 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);
+ }
+
+@@ -119,12 +119,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);
+ }
+
+@@ -138,7 +138,7 @@
+ }
+ else {
+ /* don't know where to take cmap from */
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return (PIX *)ERROR_PTR("color map is missing", procName, NULL);
+ }
+
+@@ -162,7 +162,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);
+ }
+@@ -197,7 +197,7 @@
+ pixTransferAllData(pixd, &pixdi, 0, 0);
+ }
+
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return pixd;
+ }
+
@@ -316,7 +316,7 @@
}
@@ -40,13 +220,14 @@
return ERROR_INT("failed to create GIF image handle", procName, 1);
}
-@@ -347,11 +347,11 @@
+@@ -347,15 +347,15 @@
if (EGifPutScreenDesc(gif, w, h, gif_cmap->BitsPerPixel, 0, gif_cmap)
!= GIF_OK) {
pixDestroy(&pixd);
- FreeMapObject(gif_cmap);
+- EGifCloseFile(gif);
+ GifFreeMapObject(gif_cmap);
- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
return ERROR_INT("failed to write screen description", procName, 1);
}
- FreeMapObject(gif_cmap); /* not needed after this point */
@@ -54,3 +235,45 @@
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);
+ }
+
+@@ -363,13 +363,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);
+ }
+
+@@ -398,7 +398,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);
+ }
+ }
+@@ -414,7 +414,7 @@
+
+ FREE(gif_line);
+ pixDestroy(&pixd);
+- EGifCloseFile(gif);
++ EGifCloseFile(gif, NULL);
+ return 0;
+ }
+
+Only in leptonica-1.69.my/src: .libs
+Only in leptonica-1.69.my/src: Makefile
+Only in leptonica-1.69.my: stamp-h1
More information about the arch-commits
mailing list