diff options
| author | abs <abs> | 2004-03-22 16:48:13 +0000 |
|---|---|---|
| committer | abs <abs> | 2004-03-22 16:48:13 +0000 |
| commit | 6deded100a1d525f2243dd9c3b7551892f70963d (patch) | |
| tree | 6ded41b22f8729e4775049cac2e8004f4967bdfb /graphics | |
| parent | a300d292289f3494d12422671ae381882f01f49b (diff) | |
| download | pkgsrc-6deded100a1d525f2243dd9c3b7551892f70963d.tar.gz | |
Update tiff to tiff-3.6.1nb1:
Add a patch to fix fax3 tiff handling. Without this hylafax
generates completely garbled tiff images unless error correction
was disabled: http://bugs.hylafax.org/bugzilla/show_bug.cgi?id=500
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/tiff/Makefile | 3 | ||||
| -rw-r--r-- | graphics/tiff/distinfo | 4 | ||||
| -rw-r--r-- | graphics/tiff/patches/patch-ag | 32 |
3 files changed, 25 insertions, 14 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index a138606b21e..c6bf6c9538c 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2004/01/05 22:33:45 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2004/03/22 16:48:13 abs Exp $ DISTNAME= tiff-v3.6.1 PKGNAME= tiff-3.6.1 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ http://libtiff.maptools.org/dl/ diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index dc85718938f..f887807d585 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2004/01/03 18:33:24 reed Exp $ +$NetBSD: distinfo,v 1.12 2004/03/22 16:48:13 abs Exp $ SHA1 (tiff-3.6.1/tiff-v3.6.1.tar.gz) = f7817145d8756152cc341804df6477f37ef93c38 Size (tiff-3.6.1/tiff-v3.6.1.tar.gz) = 1072165 bytes @@ -12,5 +12,5 @@ SHA1 (patch-ac) = 754a02bb0561f8944fa1c870ab8dd6c1d6bf0c49 SHA1 (patch-ad) = 9c8c96d1f57902222541ba9b5f439c94d575d9eb SHA1 (patch-ae) = d82547ecce837e667ce8f821e0cf8c8a25af2187 SHA1 (patch-af) = 51cbd54bff7999af84d6f4d49972f5ee519dd2e0 -SHA1 (patch-ag) = fb51f031121e6d290de59b08595bdbf7bc29f602 +SHA1 (patch-ag) = 4a271805b5df7a39e2e625974460f3487b7629fb SHA1 (patch-ah) = b824c4aaf1f97787afe1937ec471823164d03685 diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag index 77a28c3b1dd..b902dedc88d 100644 --- a/graphics/tiff/patches/patch-ag +++ b/graphics/tiff/patches/patch-ag @@ -1,13 +1,23 @@ -$NetBSD: patch-ag,v 1.4 2004/01/03 18:33:24 reed Exp $ +$NetBSD: patch-ag,v 1.5 2004/03/22 16:48:13 abs Exp $ ---- libtiff/tif_fax3.c.orig Mon Sep 29 23:13:07 2003 +--- libtiff/tif_fax3.c.orig Mon Mar 22 16:34:59 2004 +++ libtiff/tif_fax3.c -@@ -311,7 +311,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, ts - * this is <8 bytes. We optimize the code here to reflect the - * machine characteristics. - */ --#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__) -+#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__) || defined(_LP64) - #define FILL(n, cp) \ - switch (n) { \ - case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\ +@@ -451,7 +451,7 @@ Fax3SetupState(TIFF* tif) + Fax3BaseState* sp = Fax3State(tif); + long rowbytes, rowpixels; + int needsRefLine; +- Fax3CodecState* dsp = DecoderState(tif); ++ Fax3CodecState* dsp = (Fax3CodecState*) Fax3State(tif); + uint32 nruns; + + if (td->td_bitspersample != 1) { +@@ -1284,7 +1284,8 @@ InitCCITTFax3(TIFF* tif) + sp->recvparams = 0; + sp->subaddress = NULL; + +- tif->tif_flags |= TIFF_NOBITREV; /* decoder does bit reversal */ ++ if (sp->rw_mode == O_RDONLY) /* FIXME: improve for in place update */ ++ tif->tif_flags |= TIFF_NOBITREV; /* decoder does bit reversal */ + DecoderState(tif)->runs = NULL; + TIFFSetField(tif, TIFFTAG_FAXFILLFUNC, _TIFFFax3fillruns); + EncoderState(tif)->refline = NULL; |