[pkgsrc/trunk]: pkgsrc/graphics/tiff Update tiff to tiff-3.6.1nb1:

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/690ddf379c02
branches:  trunk
changeset: 471246:690ddf379c02
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Mar 22 16:48:13 2004 +0000

description:
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:

 graphics/tiff/Makefile         |   3 ++-
 graphics/tiff/distinfo         |   4 ++--
 graphics/tiff/patches/patch-ag |  32 +++++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 14 deletions(-)

diffs (67 lines):

diff -r 1a514217fb24 -r 690ddf379c02 graphics/tiff/Makefile
--- a/graphics/tiff/Makefile    Mon Mar 22 16:45:18 2004 +0000
+++ b/graphics/tiff/Makefile    Mon Mar 22 16:48:13 2004 +0000
@@ -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 -r 1a514217fb24 -r 690ddf379c02 graphics/tiff/distinfo
--- a/graphics/tiff/distinfo    Mon Mar 22 16:45:18 2004 +0000
+++ b/graphics/tiff/distinfo    Mon Mar 22 16:48:13 2004 +0000
@@ -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-ad) = 9c8c96d1f57902222541ba9b5f439c94d575d9eb
 SHA1 (patch-ae) = d82547ecce837e667ce8f821e0cf8c8a25af2187
 SHA1 (patch-af) = 51cbd54bff7999af84d6f4d49972f5ee519dd2e0
-SHA1 (patch-ag) = fb51f031121e6d290de59b08595bdbf7bc29f602
+SHA1 (patch-ag) = 4a271805b5df7a39e2e625974460f3487b7629fb
 SHA1 (patch-ah) = b824c4aaf1f97787afe1937ec471823164d03685
diff -r 1a514217fb24 -r 690ddf379c02 graphics/tiff/patches/patch-ag
--- a/graphics/tiff/patches/patch-ag    Mon Mar 22 16:45:18 2004 +0000
+++ b/graphics/tiff/patches/patch-ag    Mon Mar 22 16:48:13 2004 +0000
@@ -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;