From 00c28dda69f1be886da146b085f795478d661ddf Mon Sep 17 00:00:00 2001 From: Mike Welles Date: Tue, 27 Jul 1999 21:50:28 +0100 Subject: v3.5.1 release --- CVS/Entries | 22 + CVS/Repository | 1 + CVS/Root | 1 + Makefile.in | 2 +- README | 2 +- README-IPTC | 41 ++ README-v3.5.1 | 8 + TODO | 2 +- VERSION | 2 +- config.site | 2 +- configure | 4 +- contrib/CVS/Entries | 13 + contrib/CVS/Repository | 1 + contrib/CVS/Root | 1 + contrib/acorn/CVS/Entries | 7 + contrib/acorn/CVS/Repository | 1 + contrib/acorn/CVS/Root | 1 + contrib/dbs/CVS/Entries | 7 + contrib/dbs/CVS/Repository | 1 + contrib/dbs/CVS/Root | 1 + contrib/dbs/xtiff/CVS/Entries | 6 + contrib/dbs/xtiff/CVS/Repository | 1 + contrib/dbs/xtiff/CVS/Root | 1 + contrib/dosdjgpp/CVS/Entries | 7 + contrib/dosdjgpp/CVS/Repository | 1 + contrib/dosdjgpp/CVS/Root | 1 + contrib/dosdjgpp/Makefile.lib | 2 +- contrib/dosdjgpp/Makefile.tools | 2 +- contrib/dosdjgpp/Makefile.top | 2 +- contrib/iptcutil/CVS/Entries | 5 + contrib/iptcutil/CVS/Repository | 1 + contrib/iptcutil/CVS/Root | 1 + contrib/iptcutil/Makefile | 12 + contrib/iptcutil/iptcutil.c | 920 +++++++++++++++++++++++++++++++++++++ contrib/iptcutil/test.iptc | Bin 0 -> 1107 bytes contrib/iptcutil/test.txt | 32 ++ contrib/mac-cw/CVS/Entries | 8 + contrib/mac-cw/CVS/Repository | 1 + contrib/mac-cw/CVS/Root | 1 + contrib/mac-mpw/CVS/Entries | 8 + contrib/mac-mpw/CVS/Repository | 1 + contrib/mac-mpw/CVS/Root | 1 + contrib/mfs/CVS/Entries | 3 + contrib/mfs/CVS/Repository | 1 + contrib/mfs/CVS/Root | 1 + contrib/pds/CVS/Entries | 6 + contrib/pds/CVS/Repository | 1 + contrib/pds/CVS/Root | 1 + contrib/pds/tif_imageiter.c | 2 +- contrib/pds/tif_pdsdirread.c | 2 +- contrib/pds/tif_pdsdirwrite.c | 2 +- contrib/ras/CVS/Entries | 4 + contrib/ras/CVS/Repository | 1 + contrib/ras/CVS/Root | 1 + contrib/tags/Makefile.gcc | 56 --- contrib/tags/Makefile.mpw | 67 --- contrib/tags/README | 116 ----- contrib/tags/listtif.c | 32 -- contrib/tags/maketif.c | 70 --- contrib/tags/xtif_dir.c | 343 -------------- contrib/tags/xtiffio.h | 52 --- contrib/tags/xtiffiop.h | 65 --- contrib/vms/CVS/Entries | 2 + contrib/vms/CVS/Repository | 1 + contrib/vms/CVS/Root | 1 + contrib/vms/libtiff/CVS/Entries | 6 + contrib/vms/libtiff/CVS/Repository | 1 + contrib/vms/libtiff/CVS/Root | 1 + contrib/vms/tools/CVS/Entries | 2 + contrib/vms/tools/CVS/Repository | 1 + contrib/vms/tools/CVS/Root | 1 + contrib/win32/CVS/Entries | 4 + contrib/win32/CVS/Repository | 1 + contrib/win32/CVS/Root | 1 + contrib/win95/CVS/Entries | 4 + contrib/win95/CVS/Repository | 1 + contrib/win95/CVS/Root | 1 + contrib/winnt/CVS/Entries | 8 + contrib/winnt/CVS/Repository | 1 + contrib/winnt/CVS/Root | 1 + dist/CVS/Entries | 6 + dist/CVS/Repository | 1 + dist/CVS/Root | 1 + dist/newalpha | 2 +- dist/newversion | 2 +- dist/tiff.spec | 2 +- html/CVS/Entries | 27 ++ html/CVS/Repository | 1 + html/CVS/Root | 1 + html/Makefile.in | 2 +- html/bugs.html | 36 +- html/build.html | 8 +- html/contrib.html | 35 +- html/document.html | 10 +- html/images.html | 10 +- html/images/CVS/Entries | 17 + html/images/CVS/Repository | 1 + html/images/CVS/Root | 1 + html/index.html | 45 +- html/internals.html | 9 +- html/intro.html | 18 +- html/libtiff.html | 8 +- html/misc.html | 8 +- html/support.html | 8 +- html/tools.html | 10 +- html/v3.4beta007.html | 3 +- html/v3.4beta016.html | 3 +- html/v3.4beta018.html | 3 +- html/v3.4beta024.html | 3 +- html/v3.4beta028.html | 3 +- html/v3.4beta029.html | 3 +- html/v3.4beta031.html | 3 +- html/v3.4beta032.html | 3 +- html/v3.4beta033.html | 3 +- html/v3.4beta034.html | 3 +- html/v3.4beta035.html | 3 +- html/v3.4beta036.html | 3 +- html/v3.5.1.html | 75 +++ libtiff/CVS/Entries | 57 +++ libtiff/CVS/Repository | 1 + libtiff/CVS/Root | 1 + libtiff/Makefile.in | 2 +- libtiff/Makefile.lcc | 2 +- libtiff/mkg3states.c | 2 +- libtiff/mkspans.c | 2 +- libtiff/mkversion.c | 2 +- libtiff/t4.h | 2 +- libtiff/tif_acorn.c | 2 +- libtiff/tif_apple.c | 2 +- libtiff/tif_atari.c | 2 +- libtiff/tif_aux.c | 2 +- libtiff/tif_close.c | 2 +- libtiff/tif_codec.c | 2 +- libtiff/tif_compress.c | 2 +- libtiff/tif_dir.c | 39 +- libtiff/tif_dir.h | 16 +- libtiff/tif_dirinfo.c | 17 +- libtiff/tif_dirread.c | 2 +- libtiff/tif_dirwrite.c | 2 +- libtiff/tif_dumpmode.c | 2 +- libtiff/tif_error.c | 2 +- libtiff/tif_fax3.c | 2 +- libtiff/tif_fax3.h | 2 +- libtiff/tif_flush.c | 2 +- libtiff/tif_getimage.c | 2 +- libtiff/tif_jpeg.c | 2 +- libtiff/tif_lzw.c | 2 +- libtiff/tif_msdos.c | 2 +- libtiff/tif_next.c | 2 +- libtiff/tif_open.c | 2 +- libtiff/tif_packbits.c | 2 +- libtiff/tif_predict.c | 2 +- libtiff/tif_predict.h | 2 +- libtiff/tif_print.c | 12 +- libtiff/tif_read.c | 2 +- libtiff/tif_strip.c | 2 +- libtiff/tif_swab.c | 2 +- libtiff/tif_thunder.c | 2 +- libtiff/tif_tile.c | 2 +- libtiff/tif_unix.c | 2 +- libtiff/tif_version.c | 2 +- libtiff/tif_vms.c | 2 +- libtiff/tif_warning.c | 2 +- libtiff/tif_win3.c | 2 +- libtiff/tif_win32.c | 2 +- libtiff/tif_write.c | 2 +- libtiff/tif_zip.c | 2 +- libtiff/tiff.h | 6 +- libtiff/tiffcomp.h | 2 +- libtiff/tiffconf.h | 6 +- libtiff/tiffio.h | 2 +- libtiff/tiffiop.h | 2 +- man/CVS/Entries | 56 +++ man/CVS/Repository | 1 + man/CVS/Root | 1 + man/Makefile.in | 2 +- man/TIFFClose.3t | 2 +- man/TIFFError.3t | 2 +- man/TIFFFlush.3t | 2 +- man/TIFFGetField.3t | 2 +- man/TIFFOpen.3t | 2 +- man/TIFFPrintDirectory.3t | 2 +- man/TIFFRGBAImage.3t | 2 +- man/TIFFReadDirectory.3t | 2 +- man/TIFFReadEncodedStrip.3t | 2 +- man/TIFFReadEncodedTile.3t | 2 +- man/TIFFReadRGBAImage.3t | 2 +- man/TIFFReadRawStrip.3t | 2 +- man/TIFFReadRawTile.3t | 2 +- man/TIFFReadScanline.3t | 2 +- man/TIFFReadTile.3t | 2 +- man/TIFFSetDirectory.3t | 2 +- man/TIFFSetField.3t | 2 +- man/TIFFWarning.3t | 2 +- man/TIFFWriteDirectory.3t | 2 +- man/TIFFWriteEncodedStrip.3t | 2 +- man/TIFFWriteEncodedTile.3t | 2 +- man/TIFFWriteRawStrip.3t | 2 +- man/TIFFWriteRawTile.3t | 2 +- man/TIFFWriteScanline.3t | 2 +- man/TIFFbuffer.3t | 2 +- man/TIFFcodec.3t | 2 +- man/TIFFmemory.3t | 2 +- man/TIFFquery.3t | 2 +- man/TIFFsize.3t | 2 +- man/TIFFstrip.3t | 2 +- man/TIFFswab.3t | 2 +- man/TIFFtile.3t | 2 +- man/fax2ps.1 | 2 +- man/fax2tiff.1 | 2 +- man/gif2tiff.1 | 2 +- man/libtiff.3t | 2 +- man/pal2rgb.1 | 2 +- man/ppm2tiff.1 | 2 +- man/ras2tiff.1 | 2 +- man/rgb2ycbcr.1 | 2 +- man/sgi2tiff.1 | 2 +- man/thumbnail.1 | 2 +- man/tiff2bw.1 | 2 +- man/tiff2ps.1 | 2 +- man/tiffcmp.1 | 2 +- man/tiffcp.1 | 2 +- man/tiffdither.1 | 2 +- man/tiffdump.1 | 2 +- man/tiffgt.1 | 2 +- man/tiffinfo.1 | 2 +- man/tiffmedian.1 | 2 +- man/tiffsplit.1 | 2 +- man/tiffsv.1 | 2 +- port/CVS/Entries | 7 + port/CVS/Repository | 1 + port/CVS/Root | 1 + port/Makefile.in | 2 +- port/install.sh.in | 2 +- port/irix/CVS/Entries | 2 + port/irix/CVS/Repository | 1 + port/irix/CVS/Root | 1 + tiff.h | 421 +++++++++++++++++ tools/CVS/Entries | 26 ++ tools/CVS/Repository | 1 + tools/CVS/Root | 1 + tools/Makefile.in | 2 +- tools/Makefile.lcc | 2 +- tools/fax2ps.c | 2 +- tools/fax2tiff.c | 2 +- tools/gif2tiff.c | 2 +- tools/pal2rgb.c | 2 +- tools/ppm2tiff.c | 2 +- tools/ras2tiff.c | 2 +- tools/rasterfile.h | 2 +- tools/rgb2ycbcr.c | 2 +- tools/sgi2tiff.c | 2 +- tools/sgigt.c | 2 +- tools/sgisv.c | 2 +- tools/thumbnail.c | 2 +- tools/tiff2bw.c | 2 +- tools/tiff2ps.c | 2 +- tools/tiffcmp.c | 2 +- tools/tiffcp.c | 2 +- tools/tiffdither.c | 2 +- tools/tiffdump.c | 2 +- tools/tiffinfo.c | 2 +- tools/tiffmedian.c | 2 +- tools/tiffsplit.c | 2 +- 264 files changed, 2230 insertions(+), 1071 deletions(-) create mode 100644 CVS/Entries create mode 100644 CVS/Repository create mode 100644 CVS/Root create mode 100644 README-IPTC create mode 100644 README-v3.5.1 create mode 100644 contrib/CVS/Entries create mode 100644 contrib/CVS/Repository create mode 100644 contrib/CVS/Root create mode 100644 contrib/acorn/CVS/Entries create mode 100644 contrib/acorn/CVS/Repository create mode 100644 contrib/acorn/CVS/Root create mode 100644 contrib/dbs/CVS/Entries create mode 100644 contrib/dbs/CVS/Repository create mode 100644 contrib/dbs/CVS/Root create mode 100644 contrib/dbs/xtiff/CVS/Entries create mode 100644 contrib/dbs/xtiff/CVS/Repository create mode 100644 contrib/dbs/xtiff/CVS/Root create mode 100644 contrib/dosdjgpp/CVS/Entries create mode 100644 contrib/dosdjgpp/CVS/Repository create mode 100644 contrib/dosdjgpp/CVS/Root create mode 100644 contrib/iptcutil/CVS/Entries create mode 100644 contrib/iptcutil/CVS/Repository create mode 100644 contrib/iptcutil/CVS/Root create mode 100644 contrib/iptcutil/Makefile create mode 100644 contrib/iptcutil/iptcutil.c create mode 100644 contrib/iptcutil/test.iptc create mode 100644 contrib/iptcutil/test.txt create mode 100644 contrib/mac-cw/CVS/Entries create mode 100644 contrib/mac-cw/CVS/Repository create mode 100644 contrib/mac-cw/CVS/Root create mode 100644 contrib/mac-mpw/CVS/Entries create mode 100644 contrib/mac-mpw/CVS/Repository create mode 100644 contrib/mac-mpw/CVS/Root create mode 100644 contrib/mfs/CVS/Entries create mode 100644 contrib/mfs/CVS/Repository create mode 100644 contrib/mfs/CVS/Root create mode 100644 contrib/pds/CVS/Entries create mode 100644 contrib/pds/CVS/Repository create mode 100644 contrib/pds/CVS/Root create mode 100644 contrib/ras/CVS/Entries create mode 100644 contrib/ras/CVS/Repository create mode 100644 contrib/ras/CVS/Root delete mode 100644 contrib/tags/Makefile.gcc delete mode 100644 contrib/tags/Makefile.mpw delete mode 100644 contrib/tags/README delete mode 100644 contrib/tags/listtif.c delete mode 100644 contrib/tags/maketif.c delete mode 100644 contrib/tags/xtif_dir.c delete mode 100644 contrib/tags/xtiffio.h delete mode 100644 contrib/tags/xtiffiop.h create mode 100644 contrib/vms/CVS/Entries create mode 100644 contrib/vms/CVS/Repository create mode 100644 contrib/vms/CVS/Root create mode 100644 contrib/vms/libtiff/CVS/Entries create mode 100644 contrib/vms/libtiff/CVS/Repository create mode 100644 contrib/vms/libtiff/CVS/Root create mode 100644 contrib/vms/tools/CVS/Entries create mode 100644 contrib/vms/tools/CVS/Repository create mode 100644 contrib/vms/tools/CVS/Root create mode 100644 contrib/win32/CVS/Entries create mode 100644 contrib/win32/CVS/Repository create mode 100644 contrib/win32/CVS/Root create mode 100644 contrib/win95/CVS/Entries create mode 100644 contrib/win95/CVS/Repository create mode 100644 contrib/win95/CVS/Root create mode 100644 contrib/winnt/CVS/Entries create mode 100644 contrib/winnt/CVS/Repository create mode 100644 contrib/winnt/CVS/Root create mode 100644 dist/CVS/Entries create mode 100644 dist/CVS/Repository create mode 100644 dist/CVS/Root create mode 100644 html/CVS/Entries create mode 100644 html/CVS/Repository create mode 100644 html/CVS/Root create mode 100644 html/images/CVS/Entries create mode 100644 html/images/CVS/Repository create mode 100644 html/images/CVS/Root create mode 100644 html/v3.5.1.html create mode 100644 libtiff/CVS/Entries create mode 100644 libtiff/CVS/Repository create mode 100644 libtiff/CVS/Root mode change 100755 => 100644 libtiff/mkversion.c mode change 100755 => 100644 libtiff/tif_acorn.c create mode 100644 man/CVS/Entries create mode 100644 man/CVS/Repository create mode 100644 man/CVS/Root create mode 100644 port/CVS/Entries create mode 100644 port/CVS/Repository create mode 100644 port/CVS/Root create mode 100644 port/irix/CVS/Entries create mode 100644 port/irix/CVS/Repository create mode 100644 port/irix/CVS/Root create mode 100644 tiff.h create mode 100644 tools/CVS/Entries create mode 100644 tools/CVS/Repository create mode 100644 tools/CVS/Root diff --git a/CVS/Entries b/CVS/Entries new file mode 100644 index 00000000..3d24eeeb --- /dev/null +++ b/CVS/Entries @@ -0,0 +1,22 @@ +/COPYRIGHT/1.1.1.1/Tue Jul 27 21:50:26 1999// +/Makefile/1.1.1.1/Tue Jul 27 21:50:26 1999// +/Makefile.in/1.1.1.1/Tue Jul 27 21:50:26 1999// +/README/1.1.1.1/Tue Jul 27 21:50:26 1999// +/README-IPTC/1.1.1.1/Tue Jul 27 21:50:26 1999// +/TODO/1.1.1.1/Tue Jul 27 21:50:26 1999// +/VERSION/1.1.1.1/Tue Jul 27 21:50:26 1999// +/config.guess/1.1.1.1/Tue Jul 27 21:50:26 1999// +/config.site/1.1.1.1/Tue Jul 27 21:50:26 1999// +/config.sub/1.1.1.1/Tue Jul 27 21:50:26 1999// +/configure/1.1.1.1/Tue Jul 27 21:50:26 1999// +/tiff.h/1.1.1.1/Tue Jul 27 21:50:26 1999// +D/contrib//// +D/dist//// +D/html//// +D/libtiff//// +D/man//// +D/port//// +D/tools//// +/README-v3.5/-1.1.1.1/Tue Jul 27 21:50:26 1999// +/README-v3.5.1/1.1/Mon Aug 9 18:45:44 1999// +/1/-1.1.1.1/Tue Jul 27 21:50:26 1999// diff --git a/CVS/Repository b/CVS/Repository new file mode 100644 index 00000000..355fc430 --- /dev/null +++ b/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff diff --git a/CVS/Root b/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/Makefile.in b/Makefile.in index 10c5b56a..c5e4941e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ #! smake -# $Header: /d1/sam/tiff/RCS/Makefile.in,v 1.62 1997/08/29 23:24:06 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/Makefile.in,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $ # # @WARNING@ # diff --git a/README b/README index 5a806052..339494ec 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -$Header: /d1/sam/tiff/RCS/README,v 1.28 1997/08/29 21:45:14 sam Exp $ +$Header: /usr/local/cvs/internal/libtiff/README,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $ TIFF Software Distribution -------------------------- diff --git a/README-IPTC b/README-IPTC new file mode 100644 index 00000000..c70f5ff5 --- /dev/null +++ b/README-IPTC @@ -0,0 +1,41 @@ +To: sam@engr.sgi.com +cc: adam@onshore.com +cc: billr@corbis.com +cc: magick@wizards.dupont.com +Subject: libtiff fork +X-Mailer: VM 6.63 under Emacs 20.3.2 +--text follows this line-- + +I've finished merging a forked libtiff that was being shipped with +ImageMagick (that added IPTC newsphoto support) with the last libtiff +release (tiff-v3.4beta037). I'm going to make this available at +ftp://ftp.onshore.com/pub/libtiff (as tiff-v3.4beta037-IPTC). + +I'm very reluctant to fork code, and I woud refrain, but for the following: + + 1. Repeated mail to you about the patches has gone unanswered. + + 2. I keep getting mail from people strugging to get IPTC newphoto support + to work properly with ImageMagick. + + 3. The NT source distibution was already shipping with a forked version. + +In order for the situation to be less confusing, I'm going to make an +archive of the forked version available. + +I very much would like for there not to be a fork. Are you still +maintaining libtiff? If not, is there a current maintainer? + +I'm willing to adopt it if there isn't. I'd hate to see such an +important library fragment. It's extremely likely that onShore +(http://onshore.com/), will donate web space, bandwidth, and listserv +services if so. + + + +------------------------------------------------------ +M. L. Welles mike@onShore.com + http://fifth.net/ +------------------------------------------------------- + + diff --git a/README-v3.5.1 b/README-v3.5.1 new file mode 100644 index 00000000..b51914d2 --- /dev/null +++ b/README-v3.5.1 @@ -0,0 +1,8 @@ +Release 3.5.1 is merely a renaming of v3.4-beta037-IPTC to bump the +version number so that the maintainer switch is clear and folks will +know which problems I caused. See README-IPTC forchages between v3.5 +and the last version that Sam released. + + +--Mike Welles (mike@onshore.com) + diff --git a/TODO b/TODO index e434fb52..6ce2c815 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -# $Header: /d1/sam/tiff/RCS/TODO,v 1.4 1996/02/09 22:09:00 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/TODO,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $ o tiffcmp read data by strip/tile instead of scanline o YCbCr sampling support diff --git a/VERSION b/VERSION index 9e4de5cc..d5c0c991 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4beta +3.5.1 diff --git a/config.site b/config.site index 3bf150ff..e60d56b6 100644 --- a/config.site +++ b/config.site @@ -1,4 +1,4 @@ -# $Header: /d1/sam/tiff/RCS/config.site,v 1.14 1997/08/29 21:45:16 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/config.site,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $ # # TIFF Software # diff --git a/configure b/configure index 629461c2..b9fa7eda 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #!/bin/sh -# $Header: /d1/sam/tiff/RCS/configure,v 1.58 1997/08/29 22:30:51 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/configure,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $ # # Tag Image File Format (TIFF) Software # @@ -147,7 +147,7 @@ do -target|--target) ac_prev=TARGET;; -target=*|--target=*) TARGET="$ac_optarg" ;; -version|--version) - echo "This is TIFF configure $Revision: 1.58 $" + echo "This is TIFF configure $Revision: 1.1.1.1 $" exit 0 ;; -help|--help) usage; exit 0;; diff --git a/contrib/CVS/Entries b/contrib/CVS/Entries new file mode 100644 index 00000000..ab0ad631 --- /dev/null +++ b/contrib/CVS/Entries @@ -0,0 +1,13 @@ +D/acorn//// +D/dbs//// +D/dosdjgpp//// +D/iptcutil//// +D/mac-cw//// +D/mac-mpw//// +D/mfs//// +D/pds//// +D/ras//// +D/vms//// +D/win32//// +D/win95//// +D/winnt//// diff --git a/contrib/CVS/Repository b/contrib/CVS/Repository new file mode 100644 index 00000000..ae63d111 --- /dev/null +++ b/contrib/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib diff --git a/contrib/CVS/Root b/contrib/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/acorn/CVS/Entries b/contrib/acorn/CVS/Entries new file mode 100644 index 00000000..442bb996 --- /dev/null +++ b/contrib/acorn/CVS/Entries @@ -0,0 +1,7 @@ +/Makefile/1.1.1.1/Tue Jul 27 21:50:26 1999// +/ReadMe/1.1.1.1/Tue Jul 27 21:50:26 1999// +/SetVars/1.1.1.1/Tue Jul 27 21:50:26 1999// +/cleanlib/1.1.1.1/Tue Jul 27 21:50:26 1999// +/convert/1.1.1.1/Tue Jul 27 21:50:26 1999// +/install/1.1.1.1/Tue Jul 27 21:50:26 1999// +D diff --git a/contrib/acorn/CVS/Repository b/contrib/acorn/CVS/Repository new file mode 100644 index 00000000..f1a274a6 --- /dev/null +++ b/contrib/acorn/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/acorn diff --git a/contrib/acorn/CVS/Root b/contrib/acorn/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/acorn/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/dbs/CVS/Entries b/contrib/dbs/CVS/Entries new file mode 100644 index 00000000..ec683a83 --- /dev/null +++ b/contrib/dbs/CVS/Entries @@ -0,0 +1,7 @@ +/Imakefile/1.1.1.1/Tue Jul 27 21:50:26 1999// +/README/1.1.1.1/Tue Jul 27 21:50:26 1999// +/tiff-bi.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff-grayscale.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff-palette.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff-rgb.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +D/xtiff//// diff --git a/contrib/dbs/CVS/Repository b/contrib/dbs/CVS/Repository new file mode 100644 index 00000000..fe1d686a --- /dev/null +++ b/contrib/dbs/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/dbs diff --git a/contrib/dbs/CVS/Root b/contrib/dbs/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/dbs/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/dbs/xtiff/CVS/Entries b/contrib/dbs/xtiff/CVS/Entries new file mode 100644 index 00000000..fbcdce6e --- /dev/null +++ b/contrib/dbs/xtiff/CVS/Entries @@ -0,0 +1,6 @@ +/Imakefile/1.1.1.1/Tue Jul 27 21:50:27 1999// +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/patchlevel.h/1.1.1.1/Tue Jul 27 21:50:27 1999// +/xtiff.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/xtifficon.h/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/dbs/xtiff/CVS/Repository b/contrib/dbs/xtiff/CVS/Repository new file mode 100644 index 00000000..59671bff --- /dev/null +++ b/contrib/dbs/xtiff/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/dbs/xtiff diff --git a/contrib/dbs/xtiff/CVS/Root b/contrib/dbs/xtiff/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/dbs/xtiff/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/dosdjgpp/CVS/Entries b/contrib/dosdjgpp/CVS/Entries new file mode 100644 index 00000000..87919706 --- /dev/null +++ b/contrib/dosdjgpp/CVS/Entries @@ -0,0 +1,7 @@ +/Makefile.lib/1.1.1.1/Tue Jul 27 21:50:27 1999// +/Makefile.tools/1.1.1.1/Tue Jul 27 21:50:27 1999// +/Makefile.top/1.1.1.1/Tue Jul 27 21:50:27 1999// +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/conf.bat/1.1.1.1/Tue Jul 27 21:50:27 1999// +/port.h/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/dosdjgpp/CVS/Repository b/contrib/dosdjgpp/CVS/Repository new file mode 100644 index 00000000..cdc8c42c --- /dev/null +++ b/contrib/dosdjgpp/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/dosdjgpp diff --git a/contrib/dosdjgpp/CVS/Root b/contrib/dosdjgpp/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/dosdjgpp/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/dosdjgpp/Makefile.lib b/contrib/dosdjgpp/Makefile.lib index f0ccff3f..78ddce85 100644 --- a/contrib/dosdjgpp/Makefile.lib +++ b/contrib/dosdjgpp/Makefile.lib @@ -1,4 +1,4 @@ -# $Header: /d1/sam/tiff/contrib/dosdjgpp/RCS/Makefile.lib,v 1.1 1997/08/27 22:39:50 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/contrib/dosdjgpp/Makefile.lib,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ # # manually derived from Makefile.in for DJGPP v2.x (GNU C for DOS/386). # diff --git a/contrib/dosdjgpp/Makefile.tools b/contrib/dosdjgpp/Makefile.tools index d4928d62..cb229383 100644 --- a/contrib/dosdjgpp/Makefile.tools +++ b/contrib/dosdjgpp/Makefile.tools @@ -1,4 +1,4 @@ -# $Header: /d1/sam/tiff/contrib/dosdjgpp/RCS/Makefile.tools,v 1.1 1997/08/27 22:39:50 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/contrib/dosdjgpp/Makefile.tools,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ # # manually derived from Makefile.in for DJGPP v2.x (GNU C for DOS/386). # diff --git a/contrib/dosdjgpp/Makefile.top b/contrib/dosdjgpp/Makefile.top index d6bcee4c..6d4313ca 100644 --- a/contrib/dosdjgpp/Makefile.top +++ b/contrib/dosdjgpp/Makefile.top @@ -1,5 +1,5 @@ #! smake -# $Header: /d1/sam/tiff/contrib/dosdjgpp/RCS/Makefile.top,v 1.1 1997/08/27 22:39:50 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/contrib/dosdjgpp/Makefile.top,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ # # manually derived from Makefile.in (though basically nothing remains) # for DJGPP v2.x (GNU C for DOS/386). diff --git a/contrib/iptcutil/CVS/Entries b/contrib/iptcutil/CVS/Entries new file mode 100644 index 00000000..d2a5bf40 --- /dev/null +++ b/contrib/iptcutil/CVS/Entries @@ -0,0 +1,5 @@ +/Makefile/1.1.1.1/Tue Jul 27 21:50:27 1999// +/iptcutil.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/test.iptc/1.1.1.1/Tue Jul 27 21:50:27 1999// +/test.txt/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/iptcutil/CVS/Repository b/contrib/iptcutil/CVS/Repository new file mode 100644 index 00000000..e00d29ba --- /dev/null +++ b/contrib/iptcutil/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/iptcutil diff --git a/contrib/iptcutil/CVS/Root b/contrib/iptcutil/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/iptcutil/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/iptcutil/Makefile b/contrib/iptcutil/Makefile new file mode 100644 index 00000000..e8aacda1 --- /dev/null +++ b/contrib/iptcutil/Makefile @@ -0,0 +1,12 @@ +CC=gcc +CFLAGS= +iptcutil: iptcutil.c + $(CC) $(CFLAGS) -o iptcutil iptcutil.c + +clean: + rm iptcutil *~ + +all: iptcutil + + + diff --git a/contrib/iptcutil/iptcutil.c b/contrib/iptcutil/iptcutil.c new file mode 100644 index 00000000..1ee68bb1 --- /dev/null +++ b/contrib/iptcutil/iptcutil.c @@ -0,0 +1,920 @@ +#include +#include +#include +#ifdef WIN32 +#include +#endif +#include +#include +#include + +#ifdef WIN32 +#define STRNICMP strnicmp +#else +#define STRNICMP strncasecmp +#endif + +typedef struct _tag_spec +{ + short + id; + + char + *name; +} tag_spec; + +static tag_spec tags[] = { + 5,"Image Name", + 7,"Edit Status", + 10,"Priority", + 15,"Category", + 20,"Supplemental Category", + 22,"Fixture Identifier", + 25,"Keyword", + 30,"Release Date", + 35,"Release Time", + 40,"Special Instructions", + 45,"Reference Service", + 47,"Reference Date", + 50,"Reference Number", + 55,"Created Date", + 60,"Created Time", + 65,"Originating Program", + 70,"Program Version", + 75,"Object Cycle", + 80,"Byline", + 85,"Byline Title", + 90,"City", + 95,"Province State", + 100,"Country Code", + 101,"Country", + 103,"Original Transmission Reference", + 105,"Headline", + 110,"Credit", + 115,"Source", + 116,"Copyright String", + 120,"Caption", + 121,"Local Caption", + 122,"Caption Writer", + 200,"Custom Field 1", + 201,"Custom Field 2", + 202,"Custom Field 3", + 203,"Custom Field 4", + 204,"Custom Field 5", + 205,"Custom Field 6", + 206,"Custom Field 7", + 207,"Custom Field 8", + 208,"Custom Field 9", + 209,"Custom Field 10", + 210,"Custom Field 11", + 211,"Custom Field 12", + 212,"Custom Field 13", + 213,"Custom Field 14", + 214,"Custom Field 15", + 215,"Custom Field 16", + 216,"Custom Field 17", + 217,"Custom Field 18", + 218,"Custom Field 19", + 219,"Custom Field 20" +}; + +/* + * We format the output using HTML conventions + * to preserve control characters and such. + */ +void formatString(FILE *ofile, const char *s, int len) +{ + putc('"', ofile); + for (; len > 0; --len, ++s) { + char c = *s; + switch (c) { + case '&': + fputs("&", ofile); + break; +#ifdef HANDLE_GT_LT + case '<': + fputs("<", ofile); + break; + case '>': + fputs(">", ofile); + break; +#endif + case '"': + fputs(""", ofile); + break; + default: + if (iscntrl(c)) + fprintf(ofile, "&#%d;", c); + else + putc(*s, ofile); + break; + } + } + fputs("\"\n", ofile); +} + +typedef struct _html_code +{ + short + len; + const char + *code, + val; +} html_code; + +static html_code html_codes[] = { +#ifdef HANDLE_GT_LT + 4,"<",'<', + 4,">",'>', +#endif + 5,"&",'&', + 6,""",'"' +}; + +/* + * This routine converts HTML escape sequence + * back to the original ASCII representation. + * - returns the number of characters dropped. + */ +int convertHTMLcodes(char *s, int len) +{ + if (len <=0 || s==(char*)NULL || *s=='\0') + return 0; + + if (s[1] == '#') + { + int val, o; + + if (sscanf(s,"&#%d;",&val) == 1) + { + o = 3; + while (s[o] != ';') + { + o++; + if (o > 5) + break; + } + if (o < 5) + strcpy(s+1, s+1+o); + *s = val; + return o; + } + } + else + { + int + i, + codes = sizeof(html_codes) / sizeof(html_code); + + for (i=0; i < codes; i++) + { + if (html_codes[i].len <= len) + if (STRNICMP(s, html_codes[i].code, html_codes[i].len) == 0) + { + strcpy(s+1, s+html_codes[i].len); + *s = html_codes[i].val; + return html_codes[i].len-1; + } + } + } +} + +int formatIPTC(FILE *ifile, FILE *ofile) +{ + unsigned int + foundiptc, + tagsfound; + + unsigned char + recnum, + dataset; + + unsigned char + *readable, + *str; + + long + tagindx, + taglen; + + int + i, + tagcount = sizeof(tags) / sizeof(tag_spec); + + char + c; + + foundiptc = 0; /* found the IPTC-Header */ + tagsfound = 0; /* number of tags found */ + + c = getc(ifile); + while (c != EOF) + { + if (c == 0x1c) + foundiptc = 1; + else + { + if (foundiptc) + return -1; + else + continue; + } + + /* we found the 0x1c tag and now grab the dataset and record number tags */ + dataset = getc(ifile); + if ((char) dataset == EOF) + return -1; + recnum = getc(ifile); + if ((char) recnum == EOF) + return -1; + /* try to match this record to one of the ones in our named table */ + for (i=0; i< tagcount; i++) + { + if (tags[i].id == recnum) + break; + } + if (i < tagcount) + readable = tags[i].name; + else + readable = ""; + + /* then we decode the length of the block that follows - long or short fmt */ + c = getc(ifile); + if (c == EOF) + return 0; + if (c & (unsigned char) 0x80) + { + unsigned char + buffer[4]; + + for (i=0; i<4; i++) + { + c = buffer[i] = getc(ifile); + if (c == EOF) + return -1; + } + taglen = (((long) buffer[ 0 ]) << 24) | + (((long) buffer[ 1 ]) << 16) | + (((long) buffer[ 2 ]) << 8) | + (((long) buffer[ 3 ])); + } + else + { + unsigned char + x = c; + + taglen = ((long) x) << 8; + x = getc(ifile); + if ((char)x == EOF) + return -1; + taglen |= (long) x; + } + /* make a buffer to hold the tag data and snag it from the input stream */ + str=(unsigned char *) malloc((unsigned int) (taglen+1)); + if (str == (unsigned char *) NULL) + { + printf("Memory allocation failed"); + return 0; + } + for (tagindx=0; tagindx 0) + fprintf(ofile, "%d#%d#%s=",(unsigned int)dataset, (unsigned int) recnum, readable); + else + fprintf(ofile, "%d#%d=",(unsigned int)dataset, (unsigned int) recnum); + formatString( ofile, str, taglen ); + free(str); + + tagsfound++; + + c = getc(ifile); + } + return tagsfound; +} + +int tokenizer(unsigned inflag,char *token,int tokmax,char *line, +char *white,char *brkchar,char *quote,char eschar,char *brkused, +int *next,char *quoted); + +char *super_fgets(char *b, int *blen, FILE *file) +{ + int + c, + len; + + unsigned char + *q; + + len=*blen; + for (q=b; ; q++) + { + c=fgetc(file); + if (c == EOF || c == '\n') + break; + if (((int)q - (int)b + 1 ) >= (int) len) + { + int + tlen; + + tlen=(int)q-(int)b; + len<<=1; + b=(unsigned char *) realloc((char *) b,(len+2)); + if ((unsigned char *) b == (unsigned char *) NULL) + break; + q=b+tlen; + } + *q=(unsigned char) c; + } + *blen=0; + if ((unsigned char *)b != (unsigned char *) NULL) + { + int + tlen; + + tlen=(int)q - (int)b; + if (tlen == 0) + return (char *) NULL; + b[tlen] = '\0'; + *blen=++tlen; + } + return b; +} + +#define BUFFER_SZ 4096 + +int main(int argc, char *argv[]) +{ + unsigned int + length; + + unsigned char + *buffer; + + int + i, + mode; /* iptc binary, or iptc text */ + + FILE + *ifile = stdin, + *ofile = stdout; + + char + c, + *usage = "usage: iptcutil -t | -b [-i file] [-o file] output"; + + if( argc < 2 ) + { + printf(usage); + return 1; + } + + mode = 0; + length = -1; + buffer = (unsigned char *)NULL; + + for (i=1; i 0) + { + char + *s = &token[next-1]; + + len -= convertHTMLcodes(s, strlen(s)); + } + } + + fputc(0x1c, ofile); + fputc(dataset, ofile); + fputc(recnum, ofile); + if (len < 0x10000) + { + fputc((len >> 8) & 255, ofile); + fputc(len & 255, ofile); + } + else + { + fputc(((len >> 24) & 255) | 0x80, ofile); + fputc((len >> 16) & 255, ofile); + fputc((len >> 8) & 255, ofile); + fputc(len & 255, ofile); + } + next=0; + while (len--) + fputc(token[next++], ofile); + } + state++; + } + free(token); + token = (char *)NULL; + free(newstr); + newstr = (char *)NULL; + } + free(line); + + fclose( ifile ); + fclose( ofile ); + } + + return 0; +} + +/* + This routine is a generalized, finite state token parser. It allows + you extract tokens one at a time from a string of characters. The + characters used for white space, for break characters, and for quotes + can be specified. Also, characters in the string can be preceded by + a specifiable escape character which removes any special meaning the + character may have. + + There are a lot of formal parameters in this subroutine call, but + once you get familiar with them, this routine is fairly easy to use. + "#define" macros can be used to generate simpler looking calls for + commonly used applications of this routine. + + First, some terminology: + + token: used here, a single unit of information in + the form of a group of characters. + + white space: space that gets ignored (except within quotes + or when escaped), like blanks and tabs. in + addition, white space terminates a non-quoted + token. + + break character: a character that separates non-quoted tokens. + commas are a common break character. the + usage of break characters to signal the end + of a token is the same as that of white space, + except multiple break characters with nothing + or only white space between generate a null + token for each two break characters together. + + for example, if blank is set to be the white + space and comma is set to be the break + character, the line ... + + A, B, C , , DEF + + ... consists of 5 tokens: + + 1) "A" + 2) "B" + 3) "C" + 4) "" (the null string) + 5) "DEF" + + quote character: a character that, when surrounding a group + of other characters, causes the group of + characters to be treated as a single token, + no matter how many white spaces or break + characters exist in the group. also, a + token always terminates after the closing + quote. for example, if ' is the quote + character, blank is white space, and comma + is the break character, the following + string ... + + A, ' B, CD'EF GHI + + ... consists of 4 tokens: + + 1) "A" + 2) " B, CD" (note the blanks & comma) + 3) "EF" + 4) "GHI" + + the quote characters themselves do + not appear in the resultant tokens. the + double quotes are delimiters i use here for + documentation purposes only. + + escape character: a character which itself is ignored but + which causes the next character to be + used as is. ^ and \ are often used as + escape characters. an escape in the last + position of the string gets treated as a + "normal" (i.e., non-quote, non-white, + non-break, and non-escape) character. + for example, assume white space, break + character, and quote are the same as in the + above examples, and further, assume that + ^ is the escape character. then, in the + string ... + + ABC, ' DEF ^' GH' I ^ J K^ L ^ + + ... there are 7 tokens: + + 1) "ABC" + 2) " DEF ' GH" + 3) "I" + 4) " " (a lone blank) + 5) "J" + 6) "K L" + 7) "^" (passed as is at end of line) + + + OK, now that you have this background, here's how to call "tokenizer": + + result=tokenizer(flag,token,maxtok,string,white,break,quote,escape, + brkused,next,quoted) + + result: 0 if we haven't reached EOS (end of string), and + 1 if we have (this is an "int"). + + flag: right now, only the low order 3 bits are used. + 1 => convert non-quoted tokens to upper case + 2 => convert non-quoted tokens to lower case + 0 => do not convert non-quoted tokens + (this is a "char"). + + token: a character string containing the returned next token + (this is a "char[]"). + + maxtok: the maximum size of "token". characters beyond + "maxtok" are truncated (this is an "int"). + + string: the string to be parsed (this is a "char[]"). + + white: a string of the valid white spaces. example: + + char whitesp[]={" \t"}; + + blank and tab will be valid white space (this is + a "char[]"). + + break: a string of the valid break characters. example: + + char breakch[]={";,"}; + + semicolon and comma will be valid break characters + (this is a "char[]"). + + IMPORTANT: do not use the name "break" as a C + variable, as this is a reserved word in C. + + quote: a string of the valid quote characters. an example + would be + + char whitesp[]={"'\""); + + (this causes single and double quotes to be valid) + note that a token starting with one of these characters + needs the same quote character to terminate it. + + for example, + + "ABC ' + + is unterminated, but + + "DEF" and 'GHI' + + are properly terminated. note that different quote + characters can appear on the same line; only for + a given token do the quote characters have to be + the same (this is a "char[]"). + + escape: the escape character (NOT a string ... only one + allowed). use zero if none is desired (this is + a "char"). + + brkused: the break character used to terminate the current + token. if the token was quoted, this will be the + quote used. if the token is the last one on the + line, this will be zero (this is a pointer to a + "char"). + + next: this variable points to the first character of the + next token. it gets reset by "tokenizer" as it steps + through the string. set it to 0 upon initialization, + and leave it alone after that. you can change it + if you want to jump around in the string or re-parse + from the beginning, but be careful (this is a + pointer to an "int"). + + quoted: set to 1 (true) if the token was quoted and 0 (false) + if not. you may need this information (for example: + in C, a string with quotes around it is a character + string, while one without is an identifier). + + (this is a pointer to a "char"). +*/ + +/* states */ + +#define IN_WHITE 0 +#define IN_TOKEN 1 +#define IN_QUOTE 2 +#define IN_OZONE 3 + +int _p_state; /* current state */ +unsigned _p_flag; /* option flag */ +char _p_curquote; /* current quote char */ +int _p_tokpos; /* current token pos */ + +/* routine to find character in string ... used only by "tokenizer" */ + +int sindex(char ch,char *string) +{ + char *cp; + for(cp=string;*cp;++cp) + if(ch==*cp) + return (int)(cp-string); /* return postion of character */ + return -1; /* eol ... no match found */ +} + +/* routine to store a character in a string ... used only by "tokenizer" */ + +void chstore(char *string,int max,char ch) +{ + char c; + if(_p_tokpos>=0&&_p_tokpos=0) /* break */ + { + switch(_p_state) + { + case IN_WHITE: /* these are the same here ... */ + case IN_TOKEN: /* ... just get out */ + case IN_OZONE: /* ditto */ + ++(*next); + *brkused=brkchar[qp]; + goto byebye; + + case IN_QUOTE: /* just keep going */ + chstore(token,tokmax,c); + break; + } + } + else if((qp=sindex(c,quote))>=0) /* quote */ + { + switch(_p_state) + { + case IN_WHITE: /* these are identical, */ + _p_state=IN_QUOTE; /* change states */ + _p_curquote=quote[qp]; /* save quote char */ + *quoted=1; /* set to true as long as something is in quotes */ + break; + + case IN_QUOTE: + if(quote[qp]==_p_curquote) /* same as the beginning quote? */ + { + _p_state=IN_OZONE; + _p_curquote=0; + } + else + chstore(token,tokmax,c); /* treat as regular char */ + break; + + case IN_TOKEN: + case IN_OZONE: + *brkused=c; /* uses quote as break char */ + goto byebye; + } + } + else if((qp=sindex(c,white))>=0) /* white */ + { + switch(_p_state) + { + case IN_WHITE: + case IN_OZONE: + break; /* keep going */ + + case IN_TOKEN: + _p_state=IN_OZONE; + break; + + case IN_QUOTE: + chstore(token,tokmax,c); /* it's valid here */ + break; + } + } + else if(c==eschar) /* escape */ + { + nc=line[(*next)+1]; + if(nc==0) /* end of line */ + { + *brkused=0; + chstore(token,tokmax,c); + ++(*next); + goto byebye; + } + switch(_p_state) + { + case IN_WHITE: + --(*next); + _p_state=IN_TOKEN; + break; + + case IN_TOKEN: + case IN_QUOTE: + ++(*next); + chstore(token,tokmax,nc); + break; + + case IN_OZONE: + goto byebye; + } + } + else /* anything else is just a real character */ + { + switch(_p_state) + { + case IN_WHITE: + _p_state=IN_TOKEN; /* switch states */ + + case IN_TOKEN: /* these 2 are */ + case IN_QUOTE: /* identical here */ + chstore(token,tokmax,c); + break; + + case IN_OZONE: + goto byebye; + } + } + } /* end of main loop */ + +byebye: + token[_p_tokpos]=0; /* make sure token ends with EOS */ + + return 0; +} diff --git a/contrib/iptcutil/test.iptc b/contrib/iptcutil/test.iptc new file mode 100644 index 00000000..a2605622 Binary files /dev/null and b/contrib/iptcutil/test.iptc differ diff --git a/contrib/iptcutil/test.txt b/contrib/iptcutil/test.txt new file mode 100644 index 00000000..d5181004 --- /dev/null +++ b/contrib/iptcutil/test.txt @@ -0,0 +1,32 @@ +2#0="�" +2#120#Caption="Chairman of the US House Judiciary Committee, Henry Hyde,R-IL, makes his opening statement during impeachment hearings 11 December on Capitol Hill in Washington, DC. The committee is debating the articles of impechment and my take a vote on the impeachment of US President BIll Clinton on charges that he obstucted justice, lied and abused the power of his office as early as today. AFP PHOTO Paul J. RICHARDS " +2#122#Caption Writer="kb/lt" +2#100#Country Code="USA" +2#105#Headline="Old fart squeezing two fingers." +2#30#Release Date="19981211" +2#35#Release Time="000000+0000" +2#40#Special Instructions="This is a test. This is only a test. ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890" +2#80#Byline="PAUL J. RICHARDS" +2#85#Byline Title="STF" +2#110#Credit="AFP" +2#65#Originating Program="MacDesk Reporter" +2#115#Source="AFP" +2#5#Image Name="US-HYDE" +2#55#Created Date="19981211" +2#90#City="WASHINGTON" +2#95#Province State="DC" +2#101#Country="UNITED STATES" +2#103#Original Transmission Reference="DCA03" +2#15#Category="POL" +2#20#Supplemental Category="GOVERNMENT" +2#10#Priority="5" +2#25#Keyword="fart" +2#25#Keyword="squeezing" +2#25#Keyword="old" +2#25#Keyword="fingers" +2#75#Object Cycle="a" +2#60#Created Time="000000+0000" +2#70#Program Version="2.0.3" +2#130="3S" +2#135="GB" +2#231="Kaya A. Hoffmann 12/14/98 12:00:44 PM Copy To : Selects - \\KINYANI\Selects������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������" diff --git a/contrib/mac-cw/CVS/Entries b/contrib/mac-cw/CVS/Entries new file mode 100644 index 00000000..35998199 --- /dev/null +++ b/contrib/mac-cw/CVS/Entries @@ -0,0 +1,8 @@ +/Makefile.script/1.1.1.1/Tue Jul 27 21:50:27 1999// +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/mac_main.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/mac_main.h/1.1.1.1/Tue Jul 27 21:50:27 1999// +/metrowerks.note/1.1.1.1/Tue Jul 27 21:50:27 1999// +/mkg3_main.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/version.h/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/mac-cw/CVS/Repository b/contrib/mac-cw/CVS/Repository new file mode 100644 index 00000000..d620cc0a --- /dev/null +++ b/contrib/mac-cw/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/mac-cw diff --git a/contrib/mac-cw/CVS/Root b/contrib/mac-cw/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/mac-cw/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/mac-mpw/CVS/Entries b/contrib/mac-mpw/CVS/Entries new file mode 100644 index 00000000..5d8ce16e --- /dev/null +++ b/contrib/mac-mpw/CVS/Entries @@ -0,0 +1,8 @@ +/BUILD.mpw/1.1.1.1/Tue Jul 27 21:50:27 1999// +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/libtiff.make/1.1.1.1/Tue Jul 27 21:50:27 1999// +/mactrans.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/port.make/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tools.make/1.1.1.1/Tue Jul 27 21:50:27 1999// +/top.make/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/mac-mpw/CVS/Repository b/contrib/mac-mpw/CVS/Repository new file mode 100644 index 00000000..738d5fb9 --- /dev/null +++ b/contrib/mac-mpw/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/mac-mpw diff --git a/contrib/mac-mpw/CVS/Root b/contrib/mac-mpw/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/mac-mpw/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/mfs/CVS/Entries b/contrib/mfs/CVS/Entries new file mode 100644 index 00000000..a9343d70 --- /dev/null +++ b/contrib/mfs/CVS/Entries @@ -0,0 +1,3 @@ +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/mfs_file.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/mfs/CVS/Repository b/contrib/mfs/CVS/Repository new file mode 100644 index 00000000..c747801e --- /dev/null +++ b/contrib/mfs/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/mfs diff --git a/contrib/mfs/CVS/Root b/contrib/mfs/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/mfs/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/pds/CVS/Entries b/contrib/pds/CVS/Entries new file mode 100644 index 00000000..02b71f54 --- /dev/null +++ b/contrib/pds/CVS/Entries @@ -0,0 +1,6 @@ +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tif_imageiter.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tif_imageiter.h/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tif_pdsdirread.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tif_pdsdirwrite.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/pds/CVS/Repository b/contrib/pds/CVS/Repository new file mode 100644 index 00000000..4f26a798 --- /dev/null +++ b/contrib/pds/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/pds diff --git a/contrib/pds/CVS/Root b/contrib/pds/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/pds/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/pds/tif_imageiter.c b/contrib/pds/tif_imageiter.c index 9c6c4370..60dfa09b 100644 --- a/contrib/pds/tif_imageiter.c +++ b/contrib/pds/tif_imageiter.c @@ -1,4 +1,4 @@ -/* $Header: /d1/sam/tiff/contrib/pds/RCS/tif_imageiter.c,v 1.1 1997/08/29 23:12:56 sam Exp $ */ +/* $Header: /usr/local/cvs/internal/libtiff/contrib/pds/tif_imageiter.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/contrib/pds/tif_pdsdirread.c b/contrib/pds/tif_pdsdirread.c index 87ea11e3..37b5d0f5 100644 --- a/contrib/pds/tif_pdsdirread.c +++ b/contrib/pds/tif_pdsdirread.c @@ -1,4 +1,4 @@ -/* $Header: /d1/sam/tiff/contrib/pds/RCS/tif_pdsdirread.c,v 1.1 1997/08/29 23:12:56 sam Exp $ */ +/* $Header: /usr/local/cvs/internal/libtiff/contrib/pds/tif_pdsdirread.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/contrib/pds/tif_pdsdirwrite.c b/contrib/pds/tif_pdsdirwrite.c index 73dbd9ce..6b537515 100644 --- a/contrib/pds/tif_pdsdirwrite.c +++ b/contrib/pds/tif_pdsdirwrite.c @@ -1,4 +1,4 @@ -/* $Header: /d1/sam/tiff/contrib/pds/RCS/tif_pdsdirwrite.c,v 1.1 1997/08/29 23:12:56 sam Exp $ */ +/* $Header: /usr/local/cvs/internal/libtiff/contrib/pds/tif_pdsdirwrite.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */ /* When writing data to TIFF files, it is often useful to store application- specific data in a private TIFF directory so that the tags don't need to diff --git a/contrib/ras/CVS/Entries b/contrib/ras/CVS/Entries new file mode 100644 index 00000000..731047ff --- /dev/null +++ b/contrib/ras/CVS/Entries @@ -0,0 +1,4 @@ +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/ras2tif.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tif2ras.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/ras/CVS/Repository b/contrib/ras/CVS/Repository new file mode 100644 index 00000000..b4f81c23 --- /dev/null +++ b/contrib/ras/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/ras diff --git a/contrib/ras/CVS/Root b/contrib/ras/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/ras/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/tags/Makefile.gcc b/contrib/tags/Makefile.gcc deleted file mode 100644 index c4db62a2..00000000 --- a/contrib/tags/Makefile.gcc +++ /dev/null @@ -1,56 +0,0 @@ -# Makefile for XLIBTIFF -# -# Written by: Niles Ritter -# -# This Makefile is for use with gcc (2.2.2 or later) -# -DESTDIR=. -# -AR = /usr/bin/ar -AROPTS = rc -RANLIB = /usr/bin/ranlib -NULL= - -TIFFLIB=../../libtiff -PORT=../.. - -IPATH= -I. -I${TIFFLIB} -I${PORT} -CONF_LIBRARY=\ - ${NULL} -CC= gcc -COPTS= -ansi -g -CFLAGS= ${COPTS} ${IPATH} ${CONF_LIBRARY} -# -LIBS= ./libxtiff.a ${TIFFLIB}/libtiff.a - -OBJS= \ - xtif_dir.o \ - maketif.o \ - listtif.o \ - ${NULL} - -PROGS= maketif listtif -LIBXTIFF= libxtiff.a -ALL= ${LIBXTIFF} ${PROGS} - -all: ${ALL} - -library: ${LIBXTIFF} - -test: ${PROGS} - ./maketif - ./listtif - -maketif: maketif.o libxtiff.a - ${CC} ${COPTS} maketif.o ${LIBS} -o maketif - -listtif: listtif.o libxtiff.a - ${CC} ${COPTS} listtif.o ${LIBS} -o listtif - -libxtiff.a: xtif_dir.o - ${AR} ${AROPTS} libxtiff.a xtif_dir.o - ${RANLIB} libxtiff.a - -clean: - rm -f ${ALL} ${OBJS} core a.out newtif.tif - diff --git a/contrib/tags/Makefile.mpw b/contrib/tags/Makefile.mpw deleted file mode 100644 index 92f506f3..00000000 --- a/contrib/tags/Makefile.mpw +++ /dev/null @@ -1,67 +0,0 @@ -#*********************************************************************** -# -# MPW build file for example LIBXTIFF utilities -# -# written by Niles D. Ritter. -# -CC = c -AR = lib -o -RM = delete -y -LN = duplicate -y - -#debug option -#DEBUG= -sym full -DEBUG= - -# data/code model options -#MODEL= -MODEL= -model far - -TIFFLIB = :::libtiff: - -LINK.c = Link {LDFLAGS} -.o Ä .c - {CC} {DEBUG} {CFLAGS} {CPPFLAGS} {Default}.c -o {Default}.o -LDFLAGS = {DEBUG} {MODEL} -c 'MPS ' -t MPST -w -CFLAGS = {MODEL} -CPPFLAGS = -I {TIFFLIB} -OBJS = maketif.o listtif.o xtif_dir.o -CLEANOBJS = maketif.o listtif.o xtif_dir.o -CLEANOTHER = newtif.tif -CLEANINC = -LIBS = {TIFFLIB}libtiff.o ¶ - libxtiff.o ¶ - "{CLibraries}"StdClib.o ¶ - "{Libraries}"Stubs.o ¶ - "{Libraries}"Runtime.o ¶ - "{Libraries}"Interface.o - -PROGS= maketif listtif -LIBXTIFF= libxtiff.o -ALL= {LIBXTIFF} {PROGS} - -all Ä {ALL} - -library Ä {LIBXTIFF} - -test Ä {PROGS} - maketif - listtif - -compile Ä {OBJS} - -maketif Ä maketif.o libxtiff.o - {LINK.c} -o maketif maketif.o {LIBS} - -listtif Ä listtif.o libxtiff.o - {LINK.c} -o listtif listtif.o {LIBS} - -libxtiff.o Ä xtif_dir.o - lib -o libxtiff.o xtif_dir.o - -clean Ä - {RM} {CLEANOBJS} || set status 0 - {RM} {LIBXTIFF} || set status 0 - {RM} {PROGS} || set status 0 - {RM} Å.tif || set status 0 - diff --git a/contrib/tags/README b/contrib/tags/README deleted file mode 100644 index 2d096100..00000000 --- a/contrib/tags/README +++ /dev/null @@ -1,116 +0,0 @@ - -Client module for adding to LIBTIFF tagset -------------------------------------------- - Author: Niles Ritter - - -In the past, users of the "libtiff" package had to modify the -source code of the library if they required additional private tags -or codes not recognized by libtiff. Thus, whenever -a new revision of libtiff came out the client would have to -perform modifications to six or seven different files to re-install -their tags. - -The latest versions of libtiff now provide client software new routines, -giving them the opportunity to install private extensions at runtime, -rather than compile-time. This means that the client may encapsulate -all of their private tags into a separate module, which need only -be recompiled when new versions of libtiff are released; no manual -editing of files is required. - -How it works ------------- - -The mechanism for overriding the tag access has been enabled with -a single new routine, which has the following calling sequence: - - TIFFExtendProc old_extender; - - old_extender = TIFFSetTagExtender(tag_extender); - -which must be called prior to opening or creating TIFF files. - -This routine sets a static pointer to the user-specified function -, which in turn is called by TIFFDefaultDirectory(), -just after the usual TIFFSetField() and TIFFGetField() methods -are defined, and just before the compression tag is set. It also -returns a pointer to the previously-defined value of the tag-extender, -so that multiple clients may be installed. - -The TIFFExtendProc method that you define should be used to override -the TIFF file's "vsetfield" and "vgetfield" methods, so that you -can trap your new, private tags, and install their values into -a private directory structure. For your convienience, a new pointer -has also been added to the "TIFF" file structure: - - tidata_t tif_clientdir; /* client TIFF directory */ - -into which you may install whatever private directory structures you like. -You should also override the tag-printing method from within your -"vsetfield" method, to permit the symbolic printing of your new tags. - - -Example Client Code: --------------------- - -An example module has been provided as a template for installing -your own tags into a client tag extender. The module is called -"xtif_dir.c", and defines all of the interface routines, tag field -access, tag printing, etc. for most purpose. - -To see how the client module operates, there are three "fake" -tags currently installed. If you use the existing makefile you can -build them with: - - make all -f Makefile.gcc !or Makefile.mpw - maketif - listtif - -This will build two example programs called "maketif" and "listtif" -and then run them. These programs do nothing more than create a small -file called "newtif.tif", install the fake tags, and then list them out -using TIFFPrintDirectory(). - -Installing Private Tags ------------------------ - -To use this module for installing your own tags, edit each of the files - - xtif_dir.c - xtiffio.h - xtiffiop.h - -and search for the string "XXX". At these locations the comments -will direct you how to install your own tag values, define their -types, etc. Three examples tags are currently installed, demonstrating -how to implement multi-valued tags, single-valued tags, and ASCII tags. -The examples are not valid, registered tags, so you must replace them with -your own. - -To test the routines, also edit the test programs "maketif.c" and -"listtif.c" and replace the portions of the code that set the -private tag values and list them. - -Once you have edited these files, you may build the client module -with the Makefile provided, and run the test programs. - -To use these files in your own code, the "xtif_dir.c" module defines -replacement routines for the standard "TIFFOpen()" "TIFFFdOpen", -and "TIFFClose()" routines, called XTIFFOpen, XTIFFFdOpen and XTIFFClose. -You must use these routines in order to have the extended tag handlers -installed. Once installed, the standard TIFFGetField() and TIFFSetField -routines may be used as before. - -Adding Extended Tags to "tools" -------------------------------- -To create an extended-tag savvy "tiffinfo" program or other utility, you may -simply recompile and link the tools to your "libxtiff" library, adding - - -DTIFFOpen=XTIFFOpen -DTIFFClose=XTIFFClose -DTIFFFdOpen=XTIFFFdOpen - -to the compile statement. - -Bugs, Comments Etc: ------------------- - Send all reports and suggestions to ndr@tazboy.jpl.nasa.gov - (Niles Ritter). diff --git a/contrib/tags/listtif.c b/contrib/tags/listtif.c deleted file mode 100644 index 2ea12cea..00000000 --- a/contrib/tags/listtif.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * listtif.c -- lists a tiff file. - */ - -#include "xtiffio.h" -#include - -void main(int argc,char *argv[]) -{ - char *fname="newtif.tif"; - int flags; - - TIFF *tif=(TIFF*)0; /* TIFF-level descriptor */ - - if (argc>1) fname=argv[1]; - - tif=XTIFFOpen(fname,"r"); - if (!tif) goto failure; - - /* We want the double array listed */ - flags = TIFFPRINT_MYMULTIDOUBLES; - - TIFFPrintDirectory(tif,stdout,flags); - XTIFFClose(tif); - exit (0); - -failure: - printf("failure in listtif\n"); - if (tif) XTIFFClose(tif); - exit (-1); -} - diff --git a/contrib/tags/maketif.c b/contrib/tags/maketif.c deleted file mode 100644 index aad6f153..00000000 --- a/contrib/tags/maketif.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * maketif.c -- creates a little TIFF file, with - * the XTIFF extended tiff example tags. - */ - -#include -#include "xtiffio.h" - - -void SetUpTIFFDirectory(TIFF *tif); -void WriteImage(TIFF *tif); - -#define WIDTH 20 -#define HEIGHT 20 - -void main() -{ - TIFF *tif=(TIFF*)0; /* TIFF-level descriptor */ - - tif=XTIFFOpen("newtif.tif","w"); - if (!tif) goto failure; - - SetUpTIFFDirectory(tif); - WriteImage(tif); - - XTIFFClose(tif); - exit (0); - -failure: - printf("failure in maketif\n"); - if (tif) XTIFFClose(tif); - exit (-1); -} - - -void SetUpTIFFDirectory(TIFF *tif) -{ - double mymulti[6]={0.0,1.0,2.0, 3.1415926, 5.0,1.0}; - uint32 mysingle=3456; - char *ascii="This file was produced by Steven Spielberg. NOT"; - - TIFFSetField(tif,TIFFTAG_IMAGEWIDTH,WIDTH); - TIFFSetField(tif,TIFFTAG_IMAGELENGTH,HEIGHT); - TIFFSetField(tif,TIFFTAG_COMPRESSION,COMPRESSION_NONE); - TIFFSetField(tif,TIFFTAG_PHOTOMETRIC,PHOTOMETRIC_MINISBLACK); - TIFFSetField(tif,TIFFTAG_PLANARCONFIG,PLANARCONFIG_CONTIG); - TIFFSetField(tif,TIFFTAG_BITSPERSAMPLE,8); - TIFFSetField(tif,TIFFTAG_ROWSPERSTRIP,20); - - /* Install the extended TIFF tag examples */ - TIFFSetField(tif,TIFFTAG_EXAMPLE_MULTI,6,mymulti); - TIFFSetField(tif,TIFFTAG_EXAMPLE_SINGLE,mysingle); - TIFFSetField(tif,TIFFTAG_EXAMPLE_ASCII,ascii); -} - - -void WriteImage(TIFF *tif) -{ - int i; - char buffer[WIDTH]; - - memset(buffer,0,sizeof(buffer)); - for (i=0;i - -/* Tiff info structure. - * - * Entry format: - * { TAGNUMBER, ReadCount, WriteCount, DataType, FIELDNUM, - * OkToChange, PassDirCountOnSet, AsciiName } - * - * For ReadCount, WriteCount, -1 = unknown; used for mult-valued - * tags and ASCII. - */ - -static const TIFFFieldInfo xtiffFieldInfo[] = { - - /* XXX Replace these example tags with your own extended tags */ - { TIFFTAG_EXAMPLE_MULTI, -1,-1, TIFF_DOUBLE, FIELD_EXAMPLE_MULTI, - TRUE, TRUE, "MyMultivaluedTag" }, - { TIFFTAG_EXAMPLE_SINGLE, 1, 1, TIFF_LONG, FIELD_EXAMPLE_SINGLE, - TRUE, FALSE, "MySingleLongTag" }, - { TIFFTAG_EXAMPLE_ASCII, -1,-1, TIFF_ASCII, FIELD_EXAMPLE_ASCII, - TRUE, FALSE, "MyAsciiTag" }, -}; -#define N(a) (sizeof (a) / sizeof (a[0])) - - -static void -_XTIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) -{ - xtiff *xt = XTIFFDIR(tif); - XTIFFDirectory *xd = &xt->xtif_dir; - int i,num; - - /* call the inherited method */ - if (PARENT(xt,printdir)) - (PARENT(xt,printdir))(tif,fd,flags); - - /* XXX Add field printing here. Replace the three example - * tags implemented below with your own. - */ - - fprintf(fd,"--My Example Tags--\n"); - - /* Our first example tag may have a lot of values, so we - * will only print them out if the TIFFPRINT_MYMULTIDOUBLES - * flag is passed into the print method. - */ - if (TIFFFieldSet(tif,FIELD_EXAMPLE_MULTI)) - { - fprintf(fd, " My Multi-Valued Doubles:"); - if (flags & TIFFPRINT_MYMULTIDOUBLES) - { - double *value = xd->xd_example_multi; - - num = xd->xd_num_multi; - fprintf(fd,"("); - for (i=0;ixd_example_single); - } - - if (TIFFFieldSet(tif,FIELD_EXAMPLE_ASCII)) - { - _TIFFprintAsciiTag(fd,"My ASCII Tag", - xd->xd_example_ascii); - } -} - -static int -_XTIFFVSetField(TIFF* tif, ttag_t tag, va_list ap) -{ - xtiff *xt = XTIFFDIR(tif); - XTIFFDirectory* xd = &xt->xtif_dir; - int status = 1; - uint32 v32=0; - int i=0, v=0; - va_list ap1 = ap; - - /* va_start is called by the calling routine */ - - switch (tag) { - /* - * XXX put your extended tags here; replace the implemented - * example tags with your own. - */ - case TIFFTAG_EXAMPLE_MULTI: - /* multi-valued tags need to store the count as well */ - xd->xd_num_multi = (uint16) va_arg(ap, int); - _TIFFsetDoubleArray(&xd->xd_example_multi, va_arg(ap, double*), - (long) xd->xd_num_multi); - break; - case TIFFTAG_EXAMPLE_SINGLE: - xd->xd_example_single = va_arg(ap, uint32); - break; - case TIFFTAG_EXAMPLE_ASCII: - _TIFFsetString(&xd->xd_example_ascii, va_arg(ap, char*)); - break; - default: - /* call the inherited method */ - return (PARENT(xt,vsetfield))(tif,tag,ap); - break; - } - if (status) { - /* we have to override the print method here, - * after the compression tags have gotten to it. - * This makes sense because the only time we would - * need the extended print method is if an extended - * tag is set by the reader. - */ - if (!(xt->xtif_flags & XTIFFP_PRINT)) - { - PARENT(xt,printdir) = TIFFMEMBER(tif,printdir); - TIFFMEMBER(tif,printdir) = _XTIFFPrintDirectory; - xt->xtif_flags |= XTIFFP_PRINT; - } - TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit); - tif->tif_flags |= TIFF_DIRTYDIRECT; - } - va_end(ap); - return (status); -badvalue: - TIFFError(tif->tif_name, "%d: Bad value for \"%s\"", v, - _TIFFFieldWithTag(tif, tag)->field_name); - va_end(ap); - return (0); -badvalue32: - TIFFError(tif->tif_name, "%ld: Bad value for \"%s\"", v32, - _TIFFFieldWithTag(tif, tag)->field_name); - va_end(ap); - return (0); -} - - -static int -_XTIFFVGetField(TIFF* tif, ttag_t tag, va_list ap) -{ - xtiff *xt = XTIFFDIR(tif); - XTIFFDirectory* xd = &xt->xtif_dir; - - switch (tag) { - /* - * XXX put your extended tags here; replace the implemented - * example tags with your own. - */ - case TIFFTAG_EXAMPLE_MULTI: - *va_arg(ap, uint16*) = xd->xd_num_multi; - *va_arg(ap, double**) = xd->xd_example_multi; - break; - case TIFFTAG_EXAMPLE_ASCII: - *va_arg(ap, char**) = xd->xd_example_ascii; - break; - case TIFFTAG_EXAMPLE_SINGLE: - *va_arg(ap, uint32*) = xd->xd_example_single; - break; - default: - /* return inherited method */ - return (PARENT(xt,vgetfield))(tif,tag,ap); - break; - } - return (1); -} - -#define CleanupField(member) { \ - if (xd->member) { \ - _TIFFfree(xd->member); \ - xd->member = 0; \ - } \ -} -/* - * Release storage associated with a directory. - */ -static void -_XTIFFFreeDirectory(xtiff* xt) -{ - XTIFFDirectory* xd = &xt->xtif_dir; - - /* - * XXX - Purge all Your allocated memory except - * for the xtiff directory itself. This includes - * all fields that require a _TIFFsetXXX call in - * _XTIFFVSetField(). - */ - - CleanupField(xd_example_multi); - CleanupField(xd_example_ascii); - -} -#undef CleanupField - -static void _XTIFFLocalDefaultDirectory(TIFF *tif) -{ - xtiff *xt = XTIFFDIR(tif); - XTIFFDirectory* xd = &xt->xtif_dir; - - /* Install the extended Tag field info */ - _TIFFMergeFieldInfo(tif, xtiffFieldInfo, N(xtiffFieldInfo)); - - /* - * free up any dynamically allocated arrays - * before the new directory is read in. - */ - - _XTIFFFreeDirectory(xt); - _TIFFmemset(xt,0,sizeof(xtiff)); - - /* Override the tag access methods */ - - PARENT(xt,vsetfield) = TIFFMEMBER(tif,vsetfield); - TIFFMEMBER(tif,vsetfield) = _XTIFFVSetField; - PARENT(xt,vgetfield) = TIFFMEMBER(tif,vgetfield); - TIFFMEMBER(tif,vgetfield) = _XTIFFVGetField; - - /* - * XXX Set up any default values here. - */ - - xd->xd_example_single = 234; -} - - - -/********************************************************************** - * Nothing below this line should need to be changed. - **********************************************************************/ - -static TIFFExtendProc _ParentExtender; - -/* - * This is the callback procedure, and is - * called by the DefaultDirectory method - * every time a new TIFF directory is opened. - */ - -static void -_XTIFFDefaultDirectory(TIFF *tif) -{ - xtiff *xt; - - /* Allocate Directory Structure if first time, and install it */ - if (!(tif->tif_flags & XTIFF_INITIALIZED)) - { - xt = _TIFFmalloc(sizeof(xtiff)); - if (!xt) - { - /* handle memory allocation failure here ! */ - return; - } - _TIFFmemset(xt,0,sizeof(xtiff)); - /* - * Install into TIFF structure. - */ - TIFFMEMBER(tif,clientdir) = (tidata_t)xt; - tif->tif_flags |= XTIFF_INITIALIZED; /* dont do this again! */ - } - - /* set up our own defaults */ - _XTIFFLocalDefaultDirectory(tif); - - /* Since an XTIFF client module may have overridden - * the default directory method, we call it now to - * allow it to set up the rest of its own methods. - */ - - if (_ParentExtender) - (*_ParentExtender)(tif); - -} - -/* - * XTIFF Initializer -- sets up the callback - * procedure for the TIFF module. - */ - -static -void _XTIFFInitialize(void) -{ - static first_time=1; - - if (! first_time) return; /* Been there. Done that. */ - first_time = 0; - - /* Grab the inherited method and install */ - _ParentExtender = TIFFSetTagExtender(_XTIFFDefaultDirectory); -} - - -/* - * Public File I/O Routines. - */ -TIFF* -XTIFFOpen(const char* name, const char* mode) -{ - /* Set up the callback */ - _XTIFFInitialize(); - - /* Open the file; the callback will set everything up - */ - return TIFFOpen(name, mode); -} - -TIFF* -XTIFFFdOpen(int fd, const char* name, const char* mode) -{ - /* Set up the callback */ - _XTIFFInitialize(); - - /* Open the file; the callback will set everything up - */ - return TIFFFdOpen(fd, name, mode); -} - - -void -XTIFFClose(TIFF *tif) -{ - xtiff *xt = XTIFFDIR(tif); - - /* call inherited function first */ - TIFFClose(tif); - - /* Free up extended allocated memory */ - _XTIFFFreeDirectory(xt); - _TIFFfree(xt); -} diff --git a/contrib/tags/xtiffio.h b/contrib/tags/xtiffio.h deleted file mode 100644 index 2aea724d..00000000 --- a/contrib/tags/xtiffio.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * xtiffio.h -- Public interface to Extended TIFF tags - * - * This is a template for defining a client module - * which supports tag extensions to the standard libtiff - * set. Only portions of the code marked "XXX" need to - * be changed to support your tag set. - * - * written by: Niles D. Ritter - */ - -#ifndef __xtiffio_h -#define __xtiffio_h - -#include "tiffio.h" - -/* - * XXX Define your private Tag names and values here - */ - -/* These tags are not valid, but are provided for example */ -#define TIFFTAG_EXAMPLE_MULTI 61234 -#define TIFFTAG_EXAMPLE_SINGLE 61235 -#define TIFFTAG_EXAMPLE_ASCII 61236 - -/* - * XXX Define Printing method flags. These - * flags may be passed in to TIFFPrintDirectory() to - * indicate that those particular field values should - * be printed out in full, rather than just an indicator - * of whether they are present or not. - */ -#define TIFFPRINT_MYMULTIDOUBLES 0x80000000 - -/********************************************************************** - * Nothing below this line should need to be changed by the user. - **********************************************************************/ - -#if defined(__cplusplus) -extern "C" { -#endif - -extern TIFF* XTIFFOpen(const char* name, const char* mode); -extern TIFF* XTIFFFdOpen(int fd, const char* name, const char* mode); -extern void XTIFFClose(TIFF *tif); - -#if defined(__cplusplus) -} -#endif - -#endif /* __xtiffio_h */ - diff --git a/contrib/tags/xtiffiop.h b/contrib/tags/xtiffiop.h deleted file mode 100644 index 0d3f1f2c..00000000 --- a/contrib/tags/xtiffiop.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Private Extended TIFF library interface. - * - * uses private LIBTIFF interface. - * - * The portions of this module marked "XXX" should be - * modified to support your tags instead. - * - * written by: Niles D. Ritter - * - */ - -#ifndef __xtiffiop_h -#define __xtiffiop_h - -#include "tiffiop.h" -#include "xtiffio.h" - -/********************************************************************** - * User Configuration - **********************************************************************/ - -/* XXX - Define number of your extended tags here */ -#define NUM_XFIELD 3 -#define XFIELD_BASE (FIELD_LAST-NUM_XFIELD) - -/* XXX - Define your Tag Fields here */ -#define FIELD_EXAMPLE_MULTI (XFIELD_BASE+0) -#define FIELD_EXAMPLE_SINGLE (XFIELD_BASE+1) -#define FIELD_EXAMPLE_ASCII (XFIELD_BASE+2) - - -/* XXX - Define Private directory tag structure here */ -struct XTIFFDirectory { - uint16 xd_num_multi; /* dir-count for the multi tag */ - double* xd_example_multi; - uint32 xd_example_single; - char* xd_example_ascii; -}; -typedef struct XTIFFDirectory XTIFFDirectory; - -/********************************************************************** - * Nothing below this line should need to be changed by the user. - **********************************************************************/ - -struct xtiff { - TIFF *xtif_tif; /* parent TIFF pointer */ - uint32 xtif_flags; -#define XTIFFP_PRINT 0x00000001 - XTIFFDirectory xtif_dir; /* internal rep of current directory */ - TIFFVSetMethod xtif_vsetfield; /* inherited tag set routine */ - TIFFVGetMethod xtif_vgetfield; /* inherited tag get routine */ - TIFFPrintMethod xtif_printdir; /* inherited dir print method */ -}; -typedef struct xtiff xtiff; - - -#define PARENT(xt,pmember) ((xt)->xtif_ ## pmember) -#define TIFFMEMBER(tf,pmember) ((tf)->tif_ ## pmember) -#define XTIFFDIR(tif) ((xtiff *)TIFFMEMBER(tif,clientdir)) - -/* Extended TIFF flags */ -#define XTIFF_INITIALIZED 0x80000000 - -#endif /* __xtiffiop_h */ diff --git a/contrib/vms/CVS/Entries b/contrib/vms/CVS/Entries new file mode 100644 index 00000000..540f0771 --- /dev/null +++ b/contrib/vms/CVS/Entries @@ -0,0 +1,2 @@ +D/libtiff//// +D/tools//// diff --git a/contrib/vms/CVS/Repository b/contrib/vms/CVS/Repository new file mode 100644 index 00000000..ccd0675e --- /dev/null +++ b/contrib/vms/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/vms diff --git a/contrib/vms/CVS/Root b/contrib/vms/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/vms/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/vms/libtiff/CVS/Entries b/contrib/vms/libtiff/CVS/Entries new file mode 100644 index 00000000..4a16a0fa --- /dev/null +++ b/contrib/vms/libtiff/CVS/Entries @@ -0,0 +1,6 @@ +/makevms.com/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff.opt/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiffshraxp.opt/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiffshrvax.opt/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiffvec.mar/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/vms/libtiff/CVS/Repository b/contrib/vms/libtiff/CVS/Repository new file mode 100644 index 00000000..021401ed --- /dev/null +++ b/contrib/vms/libtiff/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/vms/libtiff diff --git a/contrib/vms/libtiff/CVS/Root b/contrib/vms/libtiff/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/vms/libtiff/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/vms/tools/CVS/Entries b/contrib/vms/tools/CVS/Entries new file mode 100644 index 00000000..f84e7ebd --- /dev/null +++ b/contrib/vms/tools/CVS/Entries @@ -0,0 +1,2 @@ +/makevms.com/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/vms/tools/CVS/Repository b/contrib/vms/tools/CVS/Repository new file mode 100644 index 00000000..2f2c65ec --- /dev/null +++ b/contrib/vms/tools/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/vms/tools diff --git a/contrib/vms/tools/CVS/Root b/contrib/vms/tools/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/vms/tools/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/win32/CVS/Entries b/contrib/win32/CVS/Entries new file mode 100644 index 00000000..e209d194 --- /dev/null +++ b/contrib/win32/CVS/Entries @@ -0,0 +1,4 @@ +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/dllshell.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/libtiff.def/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/win32/CVS/Repository b/contrib/win32/CVS/Repository new file mode 100644 index 00000000..c07e506e --- /dev/null +++ b/contrib/win32/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/win32 diff --git a/contrib/win32/CVS/Root b/contrib/win32/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/win32/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/win95/CVS/Entries b/contrib/win95/CVS/Entries new file mode 100644 index 00000000..cffcfd66 --- /dev/null +++ b/contrib/win95/CVS/Entries @@ -0,0 +1,4 @@ +/Makefile.w95/1.1.1.1/Tue Jul 27 21:50:27 1999// +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff2dib.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/win95/CVS/Repository b/contrib/win95/CVS/Repository new file mode 100644 index 00000000..5f4497be --- /dev/null +++ b/contrib/win95/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/win95 diff --git a/contrib/win95/CVS/Root b/contrib/win95/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/win95/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/contrib/winnt/CVS/Entries b/contrib/winnt/CVS/Entries new file mode 100644 index 00000000..49cb459b --- /dev/null +++ b/contrib/winnt/CVS/Entries @@ -0,0 +1,8 @@ +/README/1.1.1.1/Tue Jul 27 21:50:27 1999// +/README.console/1.1.1.1/Tue Jul 27 21:50:27 1999// +/fax3sm.c/1.1.1.1/Tue Jul 27 21:50:27 1999// +/libtiff.def/1.1.1.1/Tue Jul 27 21:50:27 1999// +/libtiff.mak/1.1.1.1/Tue Jul 27 21:50:27 1999// +/libtiff.vcp/1.1.1.1/Tue Jul 27 21:50:27 1999// +/version.h/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/contrib/winnt/CVS/Repository b/contrib/winnt/CVS/Repository new file mode 100644 index 00000000..fcc202e5 --- /dev/null +++ b/contrib/winnt/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/contrib/winnt diff --git a/contrib/winnt/CVS/Root b/contrib/winnt/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/contrib/winnt/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/dist/CVS/Entries b/dist/CVS/Entries new file mode 100644 index 00000000..4b367dff --- /dev/null +++ b/dist/CVS/Entries @@ -0,0 +1,6 @@ +/newalpha/1.1.1.1/Tue Jul 27 21:50:27 1999// +/newversion/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff.alpha/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff.spec/1.1.1.1/Tue Jul 27 21:50:27 1999// +/tiff.version/1.1.1.1/Tue Jul 27 21:50:27 1999// +D diff --git a/dist/CVS/Repository b/dist/CVS/Repository new file mode 100644 index 00000000..994dea91 --- /dev/null +++ b/dist/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/dist diff --git a/dist/CVS/Root b/dist/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/dist/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/dist/newalpha b/dist/newalpha index 79966004..20da2a7d 100755 --- a/dist/newalpha +++ b/dist/newalpha @@ -1,5 +1,5 @@ #! /bin/sh -# $Header: /d1/sam/tiff/dist/RCS/newalpha,v 1.1 1994/12/17 18:27:58 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/dist/newalpha,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ if test -r tiff.alpha; then ALPHA=`cat tiff.alpha`; rm -f tiff.alpha echo "$ALPHA" | awk '{ printf "define ALPHA %03d\n", $3+1}' > tiff.alpha diff --git a/dist/newversion b/dist/newversion index d472057b..6575abf1 100644 --- a/dist/newversion +++ b/dist/newversion @@ -1,5 +1,5 @@ #! /bin/sh -# $Header: /d1/sam/tiff/dist/RCS/newversion,v 1.2 1996/01/10 19:37:40 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/dist/newversion,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ # # TIFF Software # diff --git a/dist/tiff.spec b/dist/tiff.spec index 762ab397..152b9fa9 100644 --- a/dist/tiff.spec +++ b/dist/tiff.spec @@ -1,4 +1,4 @@ -# $Header: /d1/sam/tiff/dist/RCS/tiff.spec,v 1.7 1997/08/29 21:49:10 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/dist/tiff.spec,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ # # TIFF Software # diff --git a/html/CVS/Entries b/html/CVS/Entries new file mode 100644 index 00000000..c6e6dfed --- /dev/null +++ b/html/CVS/Entries @@ -0,0 +1,27 @@ +/Makefile.in/1.1.1.1/Tue Jul 27 21:50:27 1999// +D/images//// +/contrib.html/1.4/Mon Aug 9 20:21:21 1999// +/document.html/1.4/Mon Aug 9 20:21:21 1999// +/intro.html/1.4/Mon Aug 9 20:21:21 1999// +/v3.4beta007.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta016.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta018.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta024.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta028.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta029.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta031.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta032.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta033.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta034.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta035.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.4beta036.html/1.3/Mon Aug 9 20:21:21 1999// +/v3.5.1.html/1.3/Mon Aug 9 20:21:21 1999// +/bugs.html/1.5/Fri Aug 13 19:30:57 1999// +/build.html/1.5/Fri Aug 13 19:30:57 1999// +/images.html/1.5/Fri Aug 13 19:30:57 1999// +/index.html/1.9/Fri Aug 13 19:30:57 1999// +/internals.html/1.4/Fri Aug 13 19:30:57 1999// +/libtiff.html/1.4/Fri Aug 13 19:30:57 1999// +/misc.html/1.4/Fri Aug 13 19:30:57 1999// +/support.html/1.5/Fri Aug 13 19:30:57 1999// +/tools.html/1.4/Fri Aug 13 19:30:57 1999// diff --git a/html/CVS/Repository b/html/CVS/Repository new file mode 100644 index 00000000..6de9c49c --- /dev/null +++ b/html/CVS/Repository @@ -0,0 +1 @@ +/usr/local/cvs/internal/libtiff/html diff --git a/html/CVS/Root b/html/CVS/Root new file mode 100644 index 00000000..8dff0f68 --- /dev/null +++ b/html/CVS/Root @@ -0,0 +1 @@ +/usr/local/cvs diff --git a/html/Makefile.in b/html/Makefile.in index 2a0f2787..49ab2a16 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /d1/sam/tiff/html/RCS/Makefile.in,v 1.15 1997/08/29 21:47:05 sam Exp $ +# $Header: /usr/local/cvs/internal/libtiff/html/Makefile.in,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ # # @WARNING@ # diff --git a/html/bugs.html b/html/bugs.html index 9701014a..3c560654 100644 --- a/html/bugs.html +++ b/html/bugs.html @@ -4,34 +4,23 @@ Bugs and the TIFF Mailing List - + +

Bugs and the TIFF Mailing List

-
-This documentation is best viewed using a graphical browser that supports -the latest HTML directives for formatting documents. In particular, -this document was authored -for viewing with version 1.1 or newer of the -Netscape Navigator. -
- -
-

-This software is free. The only thing that I ask in return is that you -tell me when you find a problem or fix a bug. I also gladly accept -software contributions, although I hesitate to include such software in -my regular stuff if I am personally unable to test it. +This software is free. Please let us know when you find a problem or +fix a bug.

-A mailing list for users of this software is located on sgi.com. +A mailing list for users of this software is located at olympiakos.com If you want to join this mailing list or have a list-related request such as getting your name removed from it, send a request to

For example, to subscribe, send the line 
    @@ -43,24 +32,15 @@ the commands understood by the mailing list management software.
 
    
 Submissions (including bug reports) should be directed to:
 
    
 When corresponding about this software please always specify what
 version you have and what system you are running on.
 
 
    
-If all else fails, I can be reached by sending mail to the address
-shown below.
-(but beware that I'm more likely to respond to mail sent to the
-mailing list than mail sent directly to me).
 
-
    
 
    
 
-
    
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1996/04/29 19:18:06 $
-
    
-
+Last updated: $Date: 1999/08/13 19:30:57 $
 
 
diff --git a/html/build.html b/html/build.html
index 66480c7c..f4730bcd 100644
--- a/html/build.html
+++ b/html/build.html
@@ -4,7 +4,8 @@
 Building the TIFF Software Distribution
 
 
-
+ 
+
 
    
 
 Building the Software Distribution
@@ -1144,10 +1145,7 @@ libtiff/mkversion.c		program to generate libtiff/version.h.
 
    
 
    
 
-
    
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/08/29 01:00:05 $
-
    
+Last updated: $Date: 1999/08/13 19:30:57 $
 
 
 
diff --git a/html/contrib.html b/html/contrib.html
index 9f4d5ac4..5a1bb246 100644
--- a/html/contrib.html
+++ b/html/contrib.html
@@ -5,6 +5,8 @@ Contributed TIFF Software
 
 
 
+ 
+
 
    
 
 Contributed TIFF Software
@@ -14,7 +16,8 @@ Contributed TIFF Software
 
    
 The contrib directory has contributed software that
 uses the TIFF library or which is associated with the library
-(typically glue and guidance for ports to non-UNIX platforms).
+(typically glue and guidance for ports to non-UNIX platforms, or tools that
+aren't directly TIFF related).
 
 
    
 
@@ -122,22 +125,34 @@ various routines from Conrad Poelman; a TIFF image iterator and
 
 
 
-
+
+
+contrib/iptcutil
+
 
-
    
-Don't send me mail asking about this stuff; I frequently know
-absolutely nothing about it.  Send questions
-and/or bug reports directly to the authors.
+
+
+A utility by Bill Radcliffe to
+convert an extracted IPTC Newsphoto caption from a binary blob to
+ASCII text, and vice versa. IPTC binary blobs can be extracted from
+images via the ImageMagick convert(1)
+utility.
 
 
+
+
+
+
+
+
    
+Questions regarding these packages are usually best directed toward
+their authors. 
 
 
    
 
    
 
-
    
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/09/02 00:11:22 $
-
    
+Last updated: $Date: 1999/08/09 20:21:21 $
 
 
 
diff --git a/html/document.html b/html/document.html
index e6a04e3a..d5753f66 100644
--- a/html/document.html
+++ b/html/document.html
@@ -4,7 +4,8 @@
 TIFF Documentation
 
 
-
+ 
+
 
    
 
 TIFF Documentation
@@ -14,7 +15,7 @@ TIFF Documentation
 A copy of the 6.0 specification is available by public ftp at
 
 
 
 This is a PostScript version of the final 6.0 specification compressed
@@ -25,7 +26,7 @@ the same directory.
 
    
 
 
    
-Adobe (nee Aldus) provides the 6.0 spec online in
+Adobe  provides the 6.0 spec online in
 Acrobat format (PDF); this can be found at
 
 
      
@@ -42,8 +43,7 @@ TIFF Technical Notes can be retrieved from
 
      
 
 
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/08/29 22:44:59 $
+Last updated: $Date: 1999/08/09 20:21:21 $
 
      
 
 
diff --git a/html/images.html b/html/images.html
index 0f5fa3a1..72a23c7a 100644
--- a/html/images.html
+++ b/html/images.html
@@ -4,7 +4,8 @@
 TIFF Test Images
 
 
-
+ 
+
 
      
 
 TIFF Test Images
@@ -21,7 +22,7 @@ the same directory as this software.
 
 
      
 The latest archive of test images is located at
-ftp://ftp.sgi.com/graphics/tiff/v3.0pics.tar.Z.
+ftp://ftp.onshore.com/pub/libtiff/v3.4pics.tar.Z
 
 
      
 There are two other good sources for TIFF test images:
@@ -33,10 +34,7 @@ of images with different storage characteristics.
 
      
 
      
 
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/08/27 23:34:36 $
-
      
+Last updated: $Date: 1999/08/13 19:30:57 $
 
 
 
diff --git a/html/images/CVS/Entries b/html/images/CVS/Entries
new file mode 100644
index 00000000..b65efc1b
--- /dev/null
+++ b/html/images/CVS/Entries
@@ -0,0 +1,17 @@
+/back.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/bali.jpg/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/cat.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/cover.jpg/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/cramps.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/dave.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/info.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/jello.jpg/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/jim.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/note.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/oxford.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/quad.jpg/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/ring.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/smallliz.jpg/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/strike.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/warning.gif/1.1.1.1/Tue Jul 27 21:50:27 1999//
+D
diff --git a/html/images/CVS/Repository b/html/images/CVS/Repository
new file mode 100644
index 00000000..fd7136a0
--- /dev/null
+++ b/html/images/CVS/Repository
@@ -0,0 +1 @@
+/usr/local/cvs/internal/libtiff/html/images
diff --git a/html/images/CVS/Root b/html/images/CVS/Root
new file mode 100644
index 00000000..8dff0f68
--- /dev/null
+++ b/html/images/CVS/Root
@@ -0,0 +1 @@
+/usr/local/cvs
diff --git a/html/index.html b/html/index.html
index 3f96fcaf..43ecf2df 100644
--- a/html/index.html
+++ b/html/index.html
@@ -4,18 +4,21 @@
 TIFF Software
 
 
-
+ 
+
 
      
 
 TIFF Software
 
      
 
      
 
-Latest Release: v3.4
      
-Latest Software: v3.4beta037
      
-Master FTP Site: ftp.sgi.com (192.48.153.1), directory graphics/tiff
      
-Home Page: 
-  http://www.earthlink.net/~ritter/tiff/ 
      
+Latest Release: v3.5.1
      
+Latest Software: v3.5.1
      
+Master FTP Site: ftp.onshore.com , directory pub/libtiff (Active mode FTP only!)
      
+HTTP Download: http://www.libtiff.org/tiff-v3.5.1.tar.gz
      
+Anon CVS:  forthcoming 
       
+Home Page: 
+  http://www.libtiff.org 
      
 FAQ Page: forthcoming
      
 
 
@@ -46,8 +49,19 @@ machines.  This software can also be used on older 16-bit systems
 though it may require some effort and you may need to leave out some of
 the compression support.
 
+
       The software was orginally authored and maintained by Sam Leffler.
+While he keeps a fatherly eye on the mailing list, he is no longer
+responsible for day to day maintenance. 
+
+
       Questions should be sent to
+the TIFF mailing list: tiff@olympiakos.com. 
+
+
       The person responsible for putting up this site and putting together version 3.5.1 is Mike Welles. 
+
+
       
 
-
      
 The following sections are included in this documentation:
 
 
      
 
-A PostScript version of this documentation is available on-line at
-the master FTP site listed above.
-
 
      
 
      
-
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/09/02 00:11:22 $
-
      
+ 
+$Id: index.html,v 1.9 1999/08/13 19:30:57 mike Exp $
+ 
 
 
+
 
+
+
+
+
+
diff --git a/html/internals.html b/html/internals.html
index 70ec7f20..c53d5958 100644
--- a/html/internals.html
+++ b/html/internals.html
@@ -4,7 +4,8 @@
 Modifying The TIFF Library
 
 
-
+ 
+
 
      
 
 Modifying The TIFF Library
@@ -646,10 +647,8 @@ the portability of your TIFF files.
 
      
 
      
 
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/08/27 23:34:39 $
-
      
+Last updated: $Date: 1999/08/13 19:30:57 $
 
 
+
 
diff --git a/html/intro.html b/html/intro.html
index 973af74b..61c01d4a 100644
--- a/html/intro.html
+++ b/html/intro.html
@@ -4,23 +4,14 @@
 Introduction to the TIFF Documentation
 
 
-
+ 
+
 
      
 
 Introduction to the TIFF Documentation
 
      
 
 
-
      
-This documentation is best viewed using a graphical browser that supports
-the latest HTML directives for formatting documents.  In particular,
-this document was authored
-for viewing with version 1.1 or newer of the
-Netscape Navigator.
-
      
-
-
      
-
 
      
 The following definitions are used throughout this documentation.
 They are consistent with the terminology used in the TIFF 6.0 specification.
@@ -71,10 +62,7 @@ application.
 
      
 
      
 
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1996/04/29 19:18:06 $
-
      
+Last updated: $Date: 1999/08/09 20:21:21 $
 
 
 
diff --git a/html/libtiff.html b/html/libtiff.html
index c0e9a2b1..e6744ff0 100644
--- a/html/libtiff.html
+++ b/html/libtiff.html
@@ -4,7 +4,8 @@
 Using The TIFF Library
 
 
-
+ 
+
 
      
 
 Using The TIFF Library
@@ -721,10 +722,7 @@ main()
 
      
 
      
 
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/08/27 23:34:42 $
-
      
+Last updated: $Date: 1999/08/13 19:30:57 $
 
 
 
diff --git a/html/misc.html b/html/misc.html
index 6ec6efd8..91fef5a2 100644
--- a/html/misc.html
+++ b/html/misc.html
@@ -4,7 +4,8 @@
 Acknowledgments and Other Issues
 
 
-
+ 
+ 
 
      
 
 Acknowledgments and Other Issues
@@ -86,10 +87,7 @@ OF THIS SOFTWARE.
 
      
 
      
 
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/08/29 21:47:10 $
-
      
 
+Last updated: $Date: 1999/08/13 19:30:57 $
 
 
diff --git a/html/support.html b/html/support.html
index eae1bd76..63f8928e 100644
--- a/html/support.html
+++ b/html/support.html
@@ -4,7 +4,8 @@
 TIFF 6.0 Specification Coverage
 
 
-
+ 
+ 
 
      
 
 TIFF 6.0 Specification Coverage
@@ -675,10 +676,7 @@ part of the TIFF 6.0 specification).
 
      
 
      
 
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/09/02 00:11:22 $
-
      
+Last updated: $Date: 1999/08/13 19:30:57 $
 
 
 
diff --git a/html/tools.html b/html/tools.html
index 52593c46..3eaa7f8f 100644
--- a/html/tools.html
+++ b/html/tools.html
@@ -4,7 +4,8 @@
 TIFF Tools Overview
 
 
-
+ 
+ 
 
      
 
 TIFF Tools Overview
@@ -169,10 +170,9 @@ Check out the manual pages for details about the above programs.
 
      
 
      
 
-
      
-Sam Leffler / sam@engr.sgi.com.
-Last updated: $Date: 1997/08/27 23:34:47 $
-
      
+
+Last updated: $Date: 1999/08/13 19:30:57 $
+
 
 
 
diff --git a/html/v3.4beta007.html b/html/v3.4beta007.html
index 816c7cbf..c535d270 100644
--- a/html/v3.4beta007.html
+++ b/html/v3.4beta007.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta007
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -104,7 +105,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1995/07/03 18:00:06 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta016.html b/html/v3.4beta016.html
index 069bd6cf..22f185f5 100644
--- a/html/v3.4beta016.html
+++ b/html/v3.4beta016.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta016
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -114,7 +115,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1995/07/03 18:00:03 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta018.html b/html/v3.4beta018.html
index db1d84ed..ac1877fa 100644
--- a/html/v3.4beta018.html
+++ b/html/v3.4beta018.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta018
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -76,7 +77,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1995/07/19 01:54:02 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta024.html b/html/v3.4beta024.html
index 337962eb..25a33478 100644
--- a/html/v3.4beta024.html
+++ b/html/v3.4beta024.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta024
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -131,7 +132,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1995/10/16 22:00:26 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta028.html b/html/v3.4beta028.html
index bec8b88c..ff7ef69a 100644
--- a/html/v3.4beta028.html
+++ b/html/v3.4beta028.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta028
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -138,7 +139,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1996/02/09 21:28:38 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta029.html b/html/v3.4beta029.html
index 4b38d0e6..f2a3d3f6 100644
--- a/html/v3.4beta029.html
+++ b/html/v3.4beta029.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta029
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -78,7 +79,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1996/02/09 21:28:33 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta031.html b/html/v3.4beta031.html
index 032b3b5b..d5b7eac4 100644
--- a/html/v3.4beta031.html
+++ b/html/v3.4beta031.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta031
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -86,7 +87,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1996/03/18 22:05:56 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta032.html b/html/v3.4beta032.html
index f19604c2..bc14ef33 100644
--- a/html/v3.4beta032.html
+++ b/html/v3.4beta032.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta032
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -82,7 +83,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1996/04/09 17:37:03 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta033.html b/html/v3.4beta033.html
index 18012cf9..8d8345a8 100644
--- a/html/v3.4beta033.html
+++ b/html/v3.4beta033.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta033
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -74,7 +75,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1996/04/29 22:00:03 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta034.html b/html/v3.4beta034.html
index ef910bf5..77d9863b 100644
--- a/html/v3.4beta034.html
+++ b/html/v3.4beta034.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta034
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -60,7 +61,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1996/05/21 18:57:37 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta035.html b/html/v3.4beta035.html
index 56433968..22fb2b8d 100644
--- a/html/v3.4beta035.html
+++ b/html/v3.4beta035.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta035
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -55,7 +56,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1997/02/21 01:20:07 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.4beta036.html b/html/v3.4beta036.html
index 22a62270..e36754d3 100644
--- a/html/v3.4beta036.html
+++ b/html/v3.4beta036.html
@@ -6,6 +6,7 @@ Changes in TIFF v3.4beta036
 
 
 
+
 
 
 TIFF CHANGE INFORMATION
@@ -109,7 +110,7 @@ The following information is located here:
 
 
      
 Sam Leffler / sam@engr.sgi.com
-Last updated $Date: 1997/02/21 01:20:07 $.
+Last updated $Date: 1999/08/09 20:21:21 $.
 
      
 
 
diff --git a/html/v3.5.1.html b/html/v3.5.1.html
new file mode 100644
index 00000000..df613126
--- /dev/null
+++ b/html/v3.5.1.html
@@ -0,0 +1,75 @@
+
+
+
+Changes in TIFF v3.5.1
+
+
+
+
+
+ 
+
+
+TIFF CHANGE INFORMATION
+
+
+
+
+
      
+
+CHANGES IN THE SOFTWARE CONFIGURATION:
+
+
        
+		  
      •   None of consequence  
+
      
+
+
      
+
+CHANGES IN LIBTIFF:
+
+
+
        
+
      •  Support was added for IPTC Newsphoto metadata (TIFFTAGE_IPTCNEWSPHOTO)
+
      •  Support was added for photoshop caption handling (TIFFTAG_PHOTOSHOP)
+
      
+
+
      
+
+CHANGES IN THE TOOLS:
+
+
        
+
      •  Bill Radcliffe's iptcutil was
+added to the "contrib" subdirectory .  It can convert an IPTC binary
+blob to ASCII text and vice-versa.  The blob itself can be extracted
+from or added to an image with the ImageMagick convert(1)
+utility.
+
      
+
+ TIFF home page.
      
+
+
      
+
+Last updated $Date: 1999/08/09 20:21:21 $.
+
+
+
diff --git a/libtiff/CVS/Entries b/libtiff/CVS/Entries
new file mode 100644
index 00000000..5d7b86ab
--- /dev/null
+++ b/libtiff/CVS/Entries
@@ -0,0 +1,57 @@
+/Makefile/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/Makefile.in/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/Makefile.lcc/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/mkg3states.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/mkspans.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/mkversion.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/port.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/t4.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_acorn.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_apple.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_atari.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_aux.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_close.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_codec.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_compress.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_dir.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_dir.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_dirinfo.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_dirread.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_dirwrite.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_dumpmode.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_error.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_fax3.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_fax3.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_flush.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_getimage.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_jpeg.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_luv.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_lzw.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_msdos.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_next.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_open.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_packbits.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_pixarlog.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_predict.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_predict.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_print.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_read.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_strip.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_swab.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_thunder.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_tile.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_unix.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_version.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_vms.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_warning.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_win3.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_win32.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_write.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tif_zip.c/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tiff.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tiffcomp.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tiffconf.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tiffio.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/tiffiop.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+/uvcode.h/1.1.1.1/Tue Jul 27 21:50:27 1999//
+D
diff --git a/libtiff/CVS/Repository b/libtiff/CVS/Repository
new file mode 100644
index 00000000..361cf62e
--- /dev/null
+++ b/libtiff/CVS/Repository
@@ -0,0 +1 @@
+/usr/local/cvs/internal/libtiff/libtiff
diff --git a/libtiff/CVS/Root b/libtiff/CVS/Root
new file mode 100644
index 00000000..8dff0f68
--- /dev/null
+++ b/libtiff/CVS/Root
@@ -0,0 +1 @@
+/usr/local/cvs
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
index 89fb8583..f54c6079 100644
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@@ -1,4 +1,4 @@
-#	$Header: /d1/sam/tiff/libtiff/RCS/Makefile.in,v 1.43 1997/08/29 22:47:50 sam Exp $
+#	$Header: /usr/local/cvs/internal/libtiff/libtiff/Makefile.in,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $
 #
 # Tag Image File Format Library
 #
diff --git a/libtiff/Makefile.lcc b/libtiff/Makefile.lcc
index d3166bb5..2e6d2764 100644
--- a/libtiff/Makefile.lcc
+++ b/libtiff/Makefile.lcc
@@ -1,4 +1,4 @@
-# $Header: /d1/sam/tiff/libtiff/RCS/Makefile.lcc,v 1.4 1997/08/29 21:46:32 sam Exp $
+# $Header: /usr/local/cvs/internal/libtiff/libtiff/Makefile.lcc,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $
 #
 # Tag Image File Format Library
 #
diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c
index 4e39419d..d8304248 100644
--- a/libtiff/mkg3states.c
+++ b/libtiff/mkg3states.c
@@ -1,4 +1,4 @@
-/* "$Header: /d1/sam/tiff/libtiff/RCS/mkg3states.c,v 1.35 1997/08/29 21:45:42 sam Exp $ */
+/* "$Header: /usr/local/cvs/internal/libtiff/libtiff/mkg3states.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/libtiff/mkspans.c b/libtiff/mkspans.c
index 8169115d..16984f5b 100644
--- a/libtiff/mkspans.c
+++ b/libtiff/mkspans.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/mkspans.c,v 1.11 1997/08/29 21:45:43 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/mkspans.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/libtiff/mkversion.c b/libtiff/mkversion.c
old mode 100755
new mode 100644
index 13314d14..b3248f31
--- a/libtiff/mkversion.c
+++ b/libtiff/mkversion.c
@@ -1,4 +1,4 @@
-/* "$Header: /d1/sam/tiff/libtiff/RCS/mkversion.c,v 1.5 1997/08/29 21:45:43 sam Exp $ */
+/* "$Header: /usr/local/cvs/internal/libtiff/libtiff/mkversion.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff --git a/libtiff/t4.h b/libtiff/t4.h
index e7504091..10bb17a5 100644
--- a/libtiff/t4.h
+++ b/libtiff/t4.h
@@ -1,4 +1,4 @@
-/* $Id: t4.h,v 1.17 1997/08/29 21:45:36 sam Exp $ */
+/* $Id: t4.h,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_acorn.c b/libtiff/tif_acorn.c
old mode 100755
new mode 100644
index f4059be0..8b491f11
--- a/libtiff/tif_acorn.c
+++ b/libtiff/tif_acorn.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_acorn.c,v 1.2 1997/08/29 21:45:44 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_acorn.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_apple.c b/libtiff/tif_apple.c
index 19d48617..d03d6406 100644
--- a/libtiff/tif_apple.c
+++ b/libtiff/tif_apple.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_apple.c,v 1.23 1997/08/29 21:45:45 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_apple.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_atari.c b/libtiff/tif_atari.c
index 61e211c4..2800695c 100644
--- a/libtiff/tif_atari.c
+++ b/libtiff/tif_atari.c
@@ -1,4 +1,4 @@
-/* "$Header: /d1/sam/tiff/libtiff/RCS/tif_atari.c,v 1.6 1997/08/29 21:45:45 sam Exp $" */
+/* "$Header: /usr/local/cvs/internal/libtiff/libtiff/tif_atari.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $" */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c
index c17792d5..b4051b91 100644
--- a/libtiff/tif_aux.c
+++ b/libtiff/tif_aux.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_aux.c,v 1.34 1997/08/29 21:45:45 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_aux.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/libtiff/tif_close.c b/libtiff/tif_close.c
index 203d074e..6d9a9b5c 100644
--- a/libtiff/tif_close.c
+++ b/libtiff/tif_close.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_close.c,v 1.32 1997/08/29 21:45:46 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_close.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_codec.c b/libtiff/tif_codec.c
index afc7f864..9abbd43e 100644
--- a/libtiff/tif_codec.c
+++ b/libtiff/tif_codec.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_codec.c,v 1.12 1997/08/29 21:45:46 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_codec.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_compress.c b/libtiff/tif_compress.c
index 3af749c7..28c09b3e 100644
--- a/libtiff/tif_compress.c
+++ b/libtiff/tif_compress.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_compress.c,v 1.53 1997/08/29 21:45:47 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_compress.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
index 63dea966..677d6099 100644
--- a/libtiff/tif_dir.c
+++ b/libtiff/tif_dir.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_dir.c,v 1.162 1997/08/29 21:45:47 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_dir.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -423,6 +423,25 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
 		_TIFFsetByteArray(&td->td_profileData, va_arg(ap, void*),
 		    td->td_profileLength);
 		break;
+#endif
+#ifdef PHOTOSHOP_SUPPORT
+ 	case TIFFTAG_PHOTOSHOP:
+  		td->td_photoshopLength = (uint32) va_arg(ap, uint32);
+  		_TIFFsetByteArray (&td->td_photoshopData, va_arg(ap, void*),
+ 			td->td_photoshopLength);
+ 		break;
+#endif
+#ifdef IPTC_SUPPORT
+    case TIFFTAG_RICHTIFFIPTC: 
+  		td->td_richtiffiptcLength = (uint32) va_arg(ap, uint32);
+#ifdef PHOTOSHOP_SUPPORT
+  		_TIFFsetLongArray ((uint32**)&td->td_richtiffiptcData, va_arg(ap, uint32*),
+ 			td->td_richtiffiptcLength);
+#else
+  		_TIFFsetByteArray (&td->td_photoshopData, va_arg(ap, void*),
+ 			td->td_photoshopLength);
+#endif
+ 		break;
 #endif
 	default:
 		/*
@@ -751,6 +770,18 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
 		*va_arg(ap, uint32*) = td->td_profileLength;
 		*va_arg(ap, void**) = td->td_profileData;
 		break;
+#endif
+#ifdef PHOTOSHOP_SUPPORT
+ 	case TIFFTAG_PHOTOSHOP:
+ 		*va_arg(ap, uint32*) = td->td_photoshopLength;
+ 		*va_arg(ap, void**) = td->td_photoshopData;
+ 		break;
+#endif
+#ifdef IPTC_SUPPORT
+ 	case TIFFTAG_RICHTIFFIPTC:
+ 		*va_arg(ap, uint32*) = td->td_richtiffiptcLength;
+ 		*va_arg(ap, void**) = td->td_richtiffiptcData;
+ 		break;
 #endif
 	default:
 		/*
@@ -848,6 +879,12 @@ TIFFFreeDirectory(TIFF* tif)
 #endif
 #ifdef ICC_SUPPORT
 	CleanupField(td_profileData);
+#endif
+#ifdef PHOTOSHOP_SUPPORT
+	CleanupField(td_photoshopData);
+#endif
+#ifdef IPTC_SUPPORT
+	CleanupField(td_richtiffiptcData);
 #endif
 	CleanupField(td_stripoffset);
 	CleanupField(td_stripbytecount);
diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h
index 2a576249..38cf98ec 100644
--- a/libtiff/tif_dir.h
+++ b/libtiff/tif_dir.h
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_dir.h,v 1.10 1997/08/29 21:45:37 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_dir.h,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -102,6 +102,14 @@ typedef	struct {
 	uint32	td_profileLength;
 	void	*td_profileData;
 #endif
+#ifdef PHOTOSHOP_SUPPORT
+	uint32	td_photoshopLength;
+	void	*td_photoshopData;
+#endif
+#ifdef IPTC_SUPPORT
+	uint32	td_richtiffiptcLength;
+	void	*td_richtiffiptcData;
+#endif
 } TIFFDirectory;
 
 /*
@@ -174,9 +182,11 @@ typedef	struct {
 #define	FIELD_SUBIFD			49
 #define	FIELD_NUMBEROFINKS		50
 #define FIELD_ICCPROFILE		51
-#define FIELD_STONITS			52
+#define FIELD_PHOTOSHOP			52
+#define FIELD_RICHTIFFIPTC		53
+#define FIELD_STONITS			54
 /* end of support for well-known tags; codec-private tags follow */
-#define	FIELD_CODEC			53	/* base of codec-private tags */
+#define	FIELD_CODEC			55	/* base of codec-private tags */
 /*
  * Pseudo-tags don't normally need field bits since they
  * are not written to an output file (by definition).
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
index 9b716c2a..9576d56c 100644
--- a/libtiff/tif_dirinfo.c
+++ b/libtiff/tif_dirinfo.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_dirinfo.c,v 1.43 1997/08/29 21:45:48 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_dirinfo.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -216,6 +216,21 @@ static const TIFFFieldInfo tiffFieldInfo[] = {
     { TIFFTAG_TILEDEPTH,	 1, 1, TIFF_SHORT,	FIELD_TILEDEPTH,
       FALSE,	FALSE,	"TileDepth" },
 /* end SGI tags */
+#ifdef IPTC_SUPPORT
+#ifdef PHOTOSHOP_SUPPORT
+    { TIFFTAG_RICHTIFFIPTC, -1,-1, TIFF_LONG,   FIELD_RICHTIFFIPTC, 
+      FALSE,    TRUE,   "RichTIFFIPTC" },
+#else
+    { TIFFTAG_RICHTIFFIPTC, -1,-3, TIFF_UNDEFINED, FIELD_RICHTIFFIPTC, 
+      FALSE,    TRUE,   "RichTIFFIPTC" },
+#endif
+#endif
+#ifdef PHOTOSHOP_SUPPORT
+    { TIFFTAG_PHOTOSHOP,    -1,-3, TIFF_UNDEFINED, FIELD_PHOTOSHOP, 
+      FALSE,    TRUE,   "Photoshop" },
+    { TIFFTAG_PHOTOSHOP,    -1,-1, TIFF_BYTE,   FIELD_PHOTOSHOP, 
+      FALSE,    TRUE,   "Photoshop" },
+#endif
 #ifdef ICC_SUPPORT
     { TIFFTAG_ICCPROFILE,	-1,-3, TIFF_UNDEFINED,	FIELD_ICCPROFILE,
       FALSE,	TRUE,	"ICC Profile" },
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index 6cbfff48..431a7372 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_dirread.c,v 1.77 1997/08/29 21:45:49 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_dirread.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
index b54972ca..3131d406 100644
--- a/libtiff/tif_dirwrite.c
+++ b/libtiff/tif_dirwrite.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_dirwrite.c,v 1.60 1997/08/29 21:45:49 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_dirwrite.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_dumpmode.c b/libtiff/tif_dumpmode.c
index 2a9587d0..e1a7ac2a 100644
--- a/libtiff/tif_dumpmode.c
+++ b/libtiff/tif_dumpmode.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_dumpmode.c,v 1.41 1997/08/29 21:45:50 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_dumpmode.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_error.c b/libtiff/tif_error.c
index fb9686d8..1b5fdc30 100644
--- a/libtiff/tif_error.c
+++ b/libtiff/tif_error.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_error.c,v 1.22 1997/08/29 21:45:50 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_error.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c
index 316522e8..8b40e338 100644
--- a/libtiff/tif_fax3.c
+++ b/libtiff/tif_fax3.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_fax3.c,v 1.137 1997/08/29 21:45:51 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_fax3.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h
index a6fdf13e..9b8103b7 100644
--- a/libtiff/tif_fax3.h
+++ b/libtiff/tif_fax3.h
@@ -1,4 +1,4 @@
-/* $Id: tif_fax3.h,v 1.34 1997/08/29 21:45:37 sam Exp $ */
+/* $Id: tif_fax3.h,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
diff --git a/libtiff/tif_flush.c b/libtiff/tif_flush.c
index 614bec57..232f6f3f 100644
--- a/libtiff/tif_flush.c
+++ b/libtiff/tif_flush.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_flush.c,v 1.23 1997/08/29 21:45:51 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_flush.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
index c279a4e2..fb000b28 100644
--- a/libtiff/tif_getimage.c
+++ b/libtiff/tif_getimage.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_getimage.c,v 1.43 1997/08/29 21:45:52 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_getimage.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index 751734a9..74f08883 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_jpeg.c,v 1.27 1997/08/29 21:45:53 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_jpeg.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Sam Leffler
diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c
index 6ee9af61..55b3bf91 100644
--- a/libtiff/tif_lzw.c
+++ b/libtiff/tif_lzw.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_lzw.c,v 1.73 1997/08/29 21:45:54 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_lzw.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_msdos.c b/libtiff/tif_msdos.c
index e2b0ef51..d5a03017 100644
--- a/libtiff/tif_msdos.c
+++ b/libtiff/tif_msdos.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_msdos.c,v 1.15 1997/08/29 21:45:55 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_msdos.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c
index ce7b4196..4f023c65 100644
--- a/libtiff/tif_next.c
+++ b/libtiff/tif_next.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_next.c,v 1.28 1997/08/29 21:45:55 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_next.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_open.c b/libtiff/tif_open.c
index 8b43cadc..9802dddf 100644
--- a/libtiff/tif_open.c
+++ b/libtiff/tif_open.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_open.c,v 1.66 1997/08/29 21:45:56 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_open.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_packbits.c b/libtiff/tif_packbits.c
index b8d9bec6..68377960 100644
--- a/libtiff/tif_packbits.c
+++ b/libtiff/tif_packbits.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_packbits.c,v 1.50 1997/08/29 21:45:56 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_packbits.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c
index 90bc55e8..851bf881 100644
--- a/libtiff/tif_predict.c
+++ b/libtiff/tif_predict.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_predict.c,v 1.6 1997/08/29 21:45:58 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_predict.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_predict.h b/libtiff/tif_predict.h
index 8af37ace..dda6207f 100644
--- a/libtiff/tif_predict.h
+++ b/libtiff/tif_predict.h
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_predict.h,v 1.3 1997/08/29 21:45:38 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_predict.h,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
index 753ba6dc..e1562779 100644
--- a/libtiff/tif_print.c
+++ b/libtiff/tif_print.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_print.c,v 1.71 1997/08/29 21:45:58 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_print.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -419,6 +419,16 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
 		fprintf(fd, "  ICC Profile: , %lu bytes\n",
 		    (u_long) td->td_profileLength);
 #endif
+#ifdef PHOTOSHOP_SUPPORT
+ 	if (TIFFFieldSet(tif,FIELD_PHOTOSHOP))
+ 		fprintf(fd, "  Photoshop Data: , %lu bytes\n",
+ 		    (u_long) td->td_photoshopLength);
+#endif
+#ifdef IPTC_SUPPORT
+ 	if (TIFFFieldSet(tif,FIELD_RICHTIFFIPTC))
+ 		fprintf(fd, "  RichTIFFIPTC Data: , %lu bytes\n",
+ 		    (u_long) td->td_richtiffiptcLength);
+#endif
 #if SUBIFD_SUPPORT
 	if (TIFFFieldSet(tif, FIELD_SUBIFD)) {
 		fprintf(fd, "  SubIFD Offsets:");
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
index 185d340a..0de0fc5a 100644
--- a/libtiff/tif_read.c
+++ b/libtiff/tif_read.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_read.c,v 1.73 1997/08/29 21:45:59 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_read.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c
index 81d91eab..c18d84e8 100644
--- a/libtiff/tif_strip.c
+++ b/libtiff/tif_strip.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_strip.c,v 1.26 1997/08/29 21:45:59 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_strip.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/libtiff/tif_swab.c b/libtiff/tif_swab.c
index a4195056..0753f6f6 100644
--- a/libtiff/tif_swab.c
+++ b/libtiff/tif_swab.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_swab.c,v 1.23 1997/08/29 21:46:00 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_swab.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_thunder.c b/libtiff/tif_thunder.c
index 1e91e22c..8168c96b 100644
--- a/libtiff/tif_thunder.c
+++ b/libtiff/tif_thunder.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_thunder.c,v 1.30 1997/08/29 21:46:00 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_thunder.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_tile.c b/libtiff/tif_tile.c
index 02ff2f82..cf25161a 100644
--- a/libtiff/tif_tile.c
+++ b/libtiff/tif_tile.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_tile.c,v 1.28 1997/08/29 21:46:01 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_tile.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c
index f02c7f31..b4120c5c 100644
--- a/libtiff/tif_unix.c
+++ b/libtiff/tif_unix.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_unix.c,v 1.17 1997/08/29 21:46:02 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_unix.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_version.c b/libtiff/tif_version.c
index 4891c5f1..0f4ed5d6 100644
--- a/libtiff/tif_version.c
+++ b/libtiff/tif_version.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_version.c,v 1.17 1997/08/29 21:46:02 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_version.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_vms.c b/libtiff/tif_vms.c
index e782770b..d15b356f 100644
--- a/libtiff/tif_vms.c
+++ b/libtiff/tif_vms.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_vms.c,v 1.22 1997/08/29 21:46:03 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_vms.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_warning.c b/libtiff/tif_warning.c
index 7e578f38..e397469c 100644
--- a/libtiff/tif_warning.c
+++ b/libtiff/tif_warning.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_warning.c,v 1.22 1997/08/29 21:46:03 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_warning.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_win3.c b/libtiff/tif_win3.c
index 727cf5c2..add91a21 100644
--- a/libtiff/tif_win3.c
+++ b/libtiff/tif_win3.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_win3.c,v 1.8 1997/08/29 21:46:03 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_win3.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c
index ff2cd76d..b88495e0 100644
--- a/libtiff/tif_win32.c
+++ b/libtiff/tif_win32.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_win32.c,v 1.6 1997/08/29 21:46:04 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_win32.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_write.c b/libtiff/tif_write.c
index 203037cb..7134dc63 100644
--- a/libtiff/tif_write.c
+++ b/libtiff/tif_write.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_write.c,v 1.76 1997/08/29 21:46:04 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_write.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c
index e2dc1444..4e50a7be 100644
--- a/libtiff/tif_zip.c
+++ b/libtiff/tif_zip.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tif_zip.c,v 1.11 1997/08/29 21:46:05 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tif_zip.c,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff --git a/libtiff/tiff.h b/libtiff/tiff.h
index 49f05a98..0170e20b 100644
--- a/libtiff/tiff.h
+++ b/libtiff/tiff.h
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/libtiff/RCS/tiff.h,v 1.78 1997/08/29 21:45:38 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/libtiff/tiff.h,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -321,6 +321,8 @@ typedef	enum {
 #define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
 /* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
 #define	TIFFTAG_COPYRIGHT		33432	/* copyright string */
+/* IPTC TAG from RichTIFF specifications */
+#define TIFFTAG_RICHTIFFIPTC    33723
 /* 34016-34029 are reserved for ANSI IT8 TIFF/IT  */
+#define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
+#define	    COMPRESSION_JBIG		34661	/* ISO JBIG */
+#define     COMPRESSION_SGILOG		34676	/* SGI Log Luminance RLE */
+#define     COMPRESSION_SGILOG24	34677	/* SGI Log 24-bit packed */
+#define	TIFFTAG_PHOTOMETRIC		262	/* photometric interpretation */
+#define	    PHOTOMETRIC_MINISWHITE	0	/* min value is white */
+#define	    PHOTOMETRIC_MINISBLACK	1	/* min value is black */
+#define	    PHOTOMETRIC_RGB		2	/* RGB color model */
+#define	    PHOTOMETRIC_PALETTE		3	/* color map indexed */
+#define	    PHOTOMETRIC_MASK		4	/* $holdout mask */
+#define	    PHOTOMETRIC_SEPARATED	5	/* !color separations */
+#define	    PHOTOMETRIC_YCBCR		6	/* !CCIR 601 */
+#define	    PHOTOMETRIC_CIELAB		8	/* !1976 CIE L*a*b* */
+#define     PHOTOMETRIC_LOGL		32844	/* CIE Log2(L) */
+#define     PHOTOMETRIC_LOGLUV		32845	/* CIE Log2(L) (u',v') */
+#define	TIFFTAG_THRESHHOLDING		263	/* +thresholding used on data */
+#define	    THRESHHOLD_BILEVEL		1	/* b&w art scan */
+#define	    THRESHHOLD_HALFTONE		2	/* or dithered scan */
+#define	    THRESHHOLD_ERRORDIFFUSE	3	/* usually floyd-steinberg */
+#define	TIFFTAG_CELLWIDTH		264	/* +dithering matrix width */
+#define	TIFFTAG_CELLLENGTH		265	/* +dithering matrix height */
+#define	TIFFTAG_FILLORDER		266	/* data order within a byte */
+#define	    FILLORDER_MSB2LSB		1	/* most significant -> least */
+#define	    FILLORDER_LSB2MSB		2	/* least significant -> most */
+#define	TIFFTAG_DOCUMENTNAME		269	/* name of doc. image is from */
+#define	TIFFTAG_IMAGEDESCRIPTION	270	/* info about image */
+#define	TIFFTAG_MAKE			271	/* scanner manufacturer name */
+#define	TIFFTAG_MODEL			272	/* scanner model name/number */
+#define	TIFFTAG_STRIPOFFSETS		273	/* offsets to data strips */
+#define	TIFFTAG_ORIENTATION		274	/* +image orientation */
+#define	    ORIENTATION_TOPLEFT		1	/* row 0 top, col 0 lhs */
+#define	    ORIENTATION_TOPRIGHT	2	/* row 0 top, col 0 rhs */
+#define	    ORIENTATION_BOTRIGHT	3	/* row 0 bottom, col 0 rhs */
+#define	    ORIENTATION_BOTLEFT		4	/* row 0 bottom, col 0 lhs */
+#define	    ORIENTATION_LEFTTOP		5	/* row 0 lhs, col 0 top */
+#define	    ORIENTATION_RIGHTTOP	6	/* row 0 rhs, col 0 top */
+#define	    ORIENTATION_RIGHTBOT	7	/* row 0 rhs, col 0 bottom */
+#define	    ORIENTATION_LEFTBOT		8	/* row 0 lhs, col 0 bottom */
+#define	TIFFTAG_SAMPLESPERPIXEL		277	/* samples per pixel */
+#define	TIFFTAG_ROWSPERSTRIP		278	/* rows per strip of data */
+#define	TIFFTAG_STRIPBYTECOUNTS		279	/* bytes counts for strips */
+#define	TIFFTAG_MINSAMPLEVALUE		280	/* +minimum sample value */
+#define	TIFFTAG_MAXSAMPLEVALUE		281	/* +maximum sample value */
+#define	TIFFTAG_XRESOLUTION		282	/* pixels/resolution in x */
+#define	TIFFTAG_YRESOLUTION		283	/* pixels/resolution in y */
+#define	TIFFTAG_PLANARCONFIG		284	/* storage organization */
+#define	    PLANARCONFIG_CONTIG		1	/* single image plane */
+#define	    PLANARCONFIG_SEPARATE	2	/* separate planes of data */
+#define	TIFFTAG_PAGENAME		285	/* page name image is from */
+#define	TIFFTAG_XPOSITION		286	/* x page offset of image lhs */
+#define	TIFFTAG_YPOSITION		287	/* y page offset of image lhs */
+#define	TIFFTAG_FREEOFFSETS		288	/* +byte offset to free block */
+#define	TIFFTAG_FREEBYTECOUNTS		289	/* +sizes of free blocks */
+#define	TIFFTAG_GRAYRESPONSEUNIT	290	/* $gray scale curve accuracy */
+#define	    GRAYRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    GRAYRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    GRAYRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_GRAYRESPONSECURVE	291	/* $gray scale response curve */
+#define	TIFFTAG_GROUP3OPTIONS		292	/* 32 flag bits */
+#define	    GROUP3OPT_2DENCODING	0x1	/* 2-dimensional coding */
+#define	    GROUP3OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	    GROUP3OPT_FILLBITS		0x4	/* fill to byte boundary */
+#define	TIFFTAG_GROUP4OPTIONS		293	/* 32 flag bits */
+#define	    GROUP4OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	TIFFTAG_RESOLUTIONUNIT		296	/* units of resolutions */
+#define	    RESUNIT_NONE		1	/* no meaningful units */
+#define	    RESUNIT_INCH		2	/* english */
+#define	    RESUNIT_CENTIMETER		3	/* metric */
+#define	TIFFTAG_PAGENUMBER		297	/* page numbers of multi-page */
+#define	TIFFTAG_COLORRESPONSEUNIT	300	/* $color curve accuracy */
+#define	    COLORRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    COLORRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    COLORRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    COLORRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    COLORRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_TRANSFERFUNCTION	301	/* !colorimetry info */
+#define	TIFFTAG_SOFTWARE		305	/* name & release */
+#define	TIFFTAG_DATETIME		306	/* creation date and time */
+#define	TIFFTAG_ARTIST			315	/* creator of image */
+#define	TIFFTAG_HOSTCOMPUTER		316	/* machine where created */
+#define	TIFFTAG_PREDICTOR		317	/* prediction scheme w/ LZW */
+#define	TIFFTAG_WHITEPOINT		318	/* image white point */
+#define	TIFFTAG_PRIMARYCHROMATICITIES	319	/* !primary chromaticities */
+#define	TIFFTAG_COLORMAP		320	/* RGB map for pallette image */
+#define	TIFFTAG_HALFTONEHINTS		321	/* !highlight+shadow info */
+#define	TIFFTAG_TILEWIDTH		322	/* !rows/data tile */
+#define	TIFFTAG_TILELENGTH		323	/* !cols/data tile */
+#define TIFFTAG_TILEOFFSETS		324	/* !offsets to data tiles */
+#define TIFFTAG_TILEBYTECOUNTS		325	/* !byte counts for tiles */
+#define	TIFFTAG_BADFAXLINES		326	/* lines w/ wrong pixel count */
+#define	TIFFTAG_CLEANFAXDATA		327	/* regenerated line info */
+#define	    CLEANFAXDATA_CLEAN		0	/* no errors detected */
+#define	    CLEANFAXDATA_REGENERATED	1	/* receiver regenerated lines */
+#define	    CLEANFAXDATA_UNCLEAN	2	/* uncorrected errors exist */
+#define	TIFFTAG_CONSECUTIVEBADFAXLINES	328	/* max consecutive bad lines */
+#define	TIFFTAG_SUBIFD			330	/* subimage descriptors */
+#define	TIFFTAG_INKSET			332	/* !inks in separated image */
+#define	    INKSET_CMYK			1	/* !cyan-magenta-yellow-black */
+#define	TIFFTAG_INKNAMES		333	/* !ascii names of inks */
+#define	TIFFTAG_NUMBEROFINKS		334	/* !number of inks */
+#define	TIFFTAG_DOTRANGE		336	/* !0% and 100% dot codes */
+#define	TIFFTAG_TARGETPRINTER		337	/* !separation target */
+#define	TIFFTAG_EXTRASAMPLES		338	/* !info about extra samples */
+#define	    EXTRASAMPLE_UNSPECIFIED	0	/* !unspecified data */
+#define	    EXTRASAMPLE_ASSOCALPHA	1	/* !associated alpha data */
+#define	    EXTRASAMPLE_UNASSALPHA	2	/* !unassociated alpha data */
+#define	TIFFTAG_SAMPLEFORMAT		339	/* !data sample format */
+#define	    SAMPLEFORMAT_UINT		1	/* !unsigned integer data */
+#define	    SAMPLEFORMAT_INT		2	/* !signed integer data */
+#define	    SAMPLEFORMAT_IEEEFP		3	/* !IEEE floating point data */
+#define	    SAMPLEFORMAT_VOID		4	/* !untyped data */
+#define	TIFFTAG_SMINSAMPLEVALUE		340	/* !variable MinSampleValue */
+#define	TIFFTAG_SMAXSAMPLEVALUE		341	/* !variable MaxSampleValue */
+#define	TIFFTAG_JPEGTABLES		347	/* %JPEG table stream */
+/*
+ * Tags 512-521 are obsoleted by Technical Note #2
+ * which specifies a revised JPEG-in-TIFF scheme.
+ */
+#define	TIFFTAG_JPEGPROC		512	/* !JPEG processing algorithm */
+#define	    JPEGPROC_BASELINE		1	/* !baseline sequential */
+#define	    JPEGPROC_LOSSLESS		14	/* !Huffman coded lossless */
+#define	TIFFTAG_JPEGIFOFFSET		513	/* !pointer to SOI marker */
+#define	TIFFTAG_JPEGIFBYTECOUNT		514	/* !JFIF stream length */
+#define	TIFFTAG_JPEGRESTARTINTERVAL	515	/* !restart interval length */
+#define	TIFFTAG_JPEGLOSSLESSPREDICTORS	517	/* !lossless proc predictor */
+#define	TIFFTAG_JPEGPOINTTRANSFORM	518	/* !lossless point transform */
+#define	TIFFTAG_JPEGQTABLES		519	/* !Q matrice offsets */
+#define	TIFFTAG_JPEGDCTABLES		520	/* !DCT table offsets */
+#define	TIFFTAG_JPEGACTABLES		521	/* !AC coefficient offsets */
+#define	TIFFTAG_YCBCRCOEFFICIENTS	529	/* !RGB -> YCbCr transform */
+#define	TIFFTAG_YCBCRSUBSAMPLING	530	/* !YCbCr subsampling factors */
+#define	TIFFTAG_YCBCRPOSITIONING	531	/* !subsample positioning */
+#define	    YCBCRPOSITION_CENTERED	1	/* !as in PostScript Level 2 */
+#define	    YCBCRPOSITION_COSITED	2	/* !as in CCIR 601-1 */
+#define	TIFFTAG_REFERENCEBLACKWHITE	532	/* !colorimetry info */
+/* tags 32952-32956 are private tags registered to Island Graphics */
+#define TIFFTAG_REFPTS			32953	/* image reference points */
+#define TIFFTAG_REGIONTACKPOINT		32954	/* region-xform tack point */
+#define TIFFTAG_REGIONWARPCORNERS	32955	/* warp quadrilateral */
+#define TIFFTAG_REGIONAFFINE		32956	/* affine transformation mat */
+/* tags 32995-32999 are private tags registered to SGI */
+#define	TIFFTAG_MATTEING		32995	/* $use ExtraSamples */
+#define	TIFFTAG_DATATYPE		32996	/* $use SampleFormat */
+#define	TIFFTAG_IMAGEDEPTH		32997	/* z depth of image */
+#define	TIFFTAG_TILEDEPTH		32998	/* z depth/data tile */
+/* tags 33300-33309 are private tags registered to Pixar */
+/*
+ * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
+ * are set when an image has been cropped out of a larger image.  
+ * They reflect the size of the original uncropped image.
+ * The TIFFTAG_XPOSITION and TIFFTAG_YPOSITION can be used
+ * to determine the position of the smaller image in the larger one.
+ */
+#define TIFFTAG_PIXAR_IMAGEFULLWIDTH    33300   /* full image size in x */
+#define TIFFTAG_PIXAR_IMAGEFULLLENGTH   33301   /* full image size in y */
+/* tag 33405 is a private tag registered to Eastman Kodak */
+#define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
+/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
+#define	TIFFTAG_COPYRIGHT		33432	/* copyright string */
+/* IPTC TAG from RichTIFF specifications */
+#define TIFFTAG_RICHTIFFIPTC    33723
+/* 34016-34029 are reserved for ANSI IT8 TIFF/IT  */
+#define TIFFTAG_STONITS			37439	/* Sample value to Nits */
+/* tag 34929 is a private tag registered to FedEx */
+#define	TIFFTAG_FEDEX_EDR		34929	/* unknown use */
+/* tag 65535 is an undefined tag used by Eastman Kodak */
+#define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
+
+/*
+ * The following are ``pseudo tags'' that can be
+ * used to control codec-specific functionality.
+ * These tags are not written to file.  Note that
+ * these values start at 0xffff+1 so that they'll
+ * never collide with Aldus-assigned tags.
+ *
+ * If you want your private pseudo tags ``registered''
+ * (i.e. added to this file), send mail to sam@sgi.com
+ * with the appropriate C definitions to add.
+ */
+#define	TIFFTAG_FAXMODE			65536	/* Group 3/4 format control */
+#define	    FAXMODE_CLASSIC	0x0000		/* default, include RTC */
+#define	    FAXMODE_NORTC	0x0001		/* no RTC at end of data */
+#define	    FAXMODE_NOEOL	0x0002		/* no EOL code at end of row */
+#define	    FAXMODE_BYTEALIGN	0x0004		/* byte align row */
+#define	    FAXMODE_WORDALIGN	0x0008		/* word align row */
+#define	    FAXMODE_CLASSF	FAXMODE_NORTC	/* TIFF Class F */
+#define	TIFFTAG_JPEGQUALITY		65537	/* Compression quality level */
+/* Note: quality level is on the IJG 0-100 scale.  Default value is 75 */
+#define	TIFFTAG_JPEGCOLORMODE		65538	/* Auto RGB<=>YCbCr convert? */
+#define	    JPEGCOLORMODE_RAW	0x0000		/* no conversion (default) */
+#define	    JPEGCOLORMODE_RGB	0x0001		/* do auto conversion */
+#define	TIFFTAG_JPEGTABLESMODE		65539	/* What to put in JPEGTables */
+#define	    JPEGTABLESMODE_QUANT 0x0001		/* include quantization tbls */
+#define	    JPEGTABLESMODE_HUFF	0x0002		/* include Huffman tbls */
+/* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
+#define	TIFFTAG_FAXFILLFUNC		65540	/* G3/G4 fill function */
+#define	TIFFTAG_PIXARLOGDATAFMT		65549	/* PixarLogCodec I/O data sz */
+#define	    PIXARLOGDATAFMT_8BIT	0	/* regular u_char samples */
+#define	    PIXARLOGDATAFMT_8BITABGR	1	/* ABGR-order u_chars */
+#define	    PIXARLOGDATAFMT_11BITLOG	2	/* 11-bit log-encoded (raw) */
+#define	    PIXARLOGDATAFMT_12BITPICIO	3	/* as per PICIO (1.0==2048) */
+#define	    PIXARLOGDATAFMT_16BIT	4	/* signed short samples */
+#define	    PIXARLOGDATAFMT_FLOAT	5	/* IEEE float samples */
+/* 65550-65556 are allocated to Oceana Matrix  */
+#define TIFFTAG_DCSIMAGERTYPE           65550   /* imager model & filter */
+#define     DCSIMAGERMODEL_M3           0       /* M3 chip (1280 x 1024) */
+#define     DCSIMAGERMODEL_M5           1       /* M5 chip (1536 x 1024) */
+#define     DCSIMAGERMODEL_M6           2       /* M6 chip (3072 x 2048) */
+#define     DCSIMAGERFILTER_IR          0       /* infrared filter */
+#define     DCSIMAGERFILTER_MONO        1       /* monochrome filter */
+#define     DCSIMAGERFILTER_CFA         2       /* color filter array */
+#define     DCSIMAGERFILTER_OTHER       3       /* other filter */
+#define TIFFTAG_DCSINTERPMODE           65551   /* interpolation mode */
+#define     DCSINTERPMODE_NORMAL        0x0     /* whole image, default */
+#define     DCSINTERPMODE_PREVIEW       0x1     /* preview of image (384x256) */
+#define TIFFTAG_DCSBALANCEARRAY         65552   /* color balance values */
+#define TIFFTAG_DCSCORRECTMATRIX        65553   /* color correction values */
+#define TIFFTAG_DCSGAMMA                65554   /* gamma value */
+#define TIFFTAG_DCSTOESHOULDERPTS       65555   /* toe & shoulder points */
+#define TIFFTAG_DCSCALIBRATIONFD        65556   /* calibration file desc */
+/* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
+#define	TIFFTAG_ZIPQUALITY		65557	/* compression quality level */
+#define	TIFFTAG_PIXARLOGQUALITY		65558	/* PixarLog uses same scale */
+/* 65559 is allocated to Oceana Matrix  */
+#define TIFFTAG_DCSCLIPRECTANGLE	65559	/* area of image to acquire */
+#define TIFFTAG_SGILOGDATAFMT		65560	/* SGILog user data format */
+#define     SGILOGDATAFMT_FLOAT		0	/* IEEE float samples */
+#define     SGILOGDATAFMT_16BIT		1	/* 16-bit samples */
+#define     SGILOGDATAFMT_RAW		2	/* uninterpreted data */
+#define     SGILOGDATAFMT_8BIT		3	/* 8-bit RGB monitor values */
+#endif /* _TIFF_ */
diff --git a/tools/CVS/Entries b/tools/CVS/Entries
new file mode 100644
index 00000000..b0860b5f
--- /dev/null
+++ b/tools/CVS/Entries
@@ -0,0 +1,26 @@
+/Makefile/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/Makefile.in/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/Makefile.lcc/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/fax2ps.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/fax2tiff.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/gif2tiff.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/pal2rgb.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/ppm2tiff.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/ras2tiff.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/rasterfile.h/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/rgb2ycbcr.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/sgi2tiff.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/sgigt.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/sgisv.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/thumbnail.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiff2bw.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiff2ps.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiffcmp.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiffcp.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiffdither.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiffdump.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiffinfo.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiffmedian.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/tiffsplit.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+/ycbcr.c/1.1.1.1/Tue Jul 27 21:50:28 1999//
+D
diff --git a/tools/CVS/Repository b/tools/CVS/Repository
new file mode 100644
index 00000000..96299f75
--- /dev/null
+++ b/tools/CVS/Repository
@@ -0,0 +1 @@
+/usr/local/cvs/internal/libtiff/tools
diff --git a/tools/CVS/Root b/tools/CVS/Root
new file mode 100644
index 00000000..8dff0f68
--- /dev/null
+++ b/tools/CVS/Root
@@ -0,0 +1 @@
+/usr/local/cvs
diff --git a/tools/Makefile.in b/tools/Makefile.in
index cb0c13af..b80c037e 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-#	$Header: /d1/sam/tiff/tools/RCS/Makefile.in,v 1.22 1997/08/29 21:46:45 sam Exp $
+#	$Header: /usr/local/cvs/internal/libtiff/tools/Makefile.in,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $
 #
 # @WARNING@
 #
diff --git a/tools/Makefile.lcc b/tools/Makefile.lcc
index 4e6643a1..89423d2f 100644
--- a/tools/Makefile.lcc
+++ b/tools/Makefile.lcc
@@ -1,4 +1,4 @@
-# $Header: /d1/sam/tiff/tools/RCS/Makefile.lcc,v 1.5 1997/08/29 21:46:45 sam Exp $
+# $Header: /usr/local/cvs/internal/libtiff/tools/Makefile.lcc,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $
 #
 # TIFF Library Tools
 #
diff --git a/tools/fax2ps.c b/tools/fax2ps.c
index f2efa53a..36ab150e 100644
--- a/tools/fax2ps.c
+++ b/tools/fax2ps.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/fax2ps.c,v 1.11 1997/08/29 21:46:46 sam Exp $" */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/fax2ps.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $" */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
index 941d7a0e..6073c197 100644
--- a/tools/fax2tiff.c
+++ b/tools/fax2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/fax2tiff.c,v 1.41 1997/08/29 21:46:46 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/fax2tiff.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c
index e6691928..82be4fb8 100644
--- a/tools/gif2tiff.c
+++ b/tools/gif2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/gif2tiff.c,v 1.29 1997/08/29 21:46:46 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/gif2tiff.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c
index 9b853182..e90d7d7f 100644
--- a/tools/pal2rgb.c
+++ b/tools/pal2rgb.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/pal2rgb.c,v 1.31 1997/08/29 21:46:47 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/pal2rgb.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c
index 489cb9fa..532a8b68 100644
--- a/tools/ppm2tiff.c
+++ b/tools/ppm2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/ppm2tiff.c,v 1.27 1997/08/29 21:46:47 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/ppm2tiff.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/tools/ras2tiff.c b/tools/ras2tiff.c
index 86b9168d..95379205 100644
--- a/tools/ras2tiff.c
+++ b/tools/ras2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/ras2tiff.c,v 1.31 1997/08/29 21:46:48 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/ras2tiff.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/rasterfile.h b/tools/rasterfile.h
index 1ebf3528..849a8397 100644
--- a/tools/rasterfile.h
+++ b/tools/rasterfile.h
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/rasterfile.h,v 1.1 1990/10/08 17:24:23 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/rasterfile.h,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Description of header for files containing raster images
diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c
index f08fae2f..27214d3f 100644
--- a/tools/rgb2ycbcr.c
+++ b/tools/rgb2ycbcr.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/rgb2ycbcr.c,v 1.29 1997/08/29 21:46:48 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/rgb2ycbcr.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/tools/sgi2tiff.c b/tools/sgi2tiff.c
index dbe30cf5..7b028529 100644
--- a/tools/sgi2tiff.c
+++ b/tools/sgi2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/sgi2tiff.c,v 1.27 1997/08/29 21:46:49 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/sgi2tiff.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff --git a/tools/sgigt.c b/tools/sgigt.c
index d9d14d46..913e8e5a 100644
--- a/tools/sgigt.c
+++ b/tools/sgigt.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/sgigt.c,v 1.70 1997/08/31 23:54:02 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/sgigt.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/sgisv.c b/tools/sgisv.c
index 3fd937eb..43a64780 100644
--- a/tools/sgisv.c
+++ b/tools/sgisv.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/sgisv.c,v 1.26 1997/08/29 21:46:50 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/sgisv.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
diff --git a/tools/thumbnail.c b/tools/thumbnail.c
index d55c5f1b..c588548a 100644
--- a/tools/thumbnail.c
+++ b/tools/thumbnail.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/thumbnail.c,v 1.12 1997/08/29 21:46:50 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/thumbnail.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Sam Leffler
diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c
index 3455f5c8..0f7a75f9 100644
--- a/tools/tiff2bw.c
+++ b/tools/tiff2bw.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiff2bw.c,v 1.22 1997/08/29 21:46:50 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiff2bw.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c
index b0f0d032..8d4ee8b9 100644
--- a/tools/tiff2ps.c
+++ b/tools/tiff2ps.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiff2ps.c,v 1.53 1997/08/29 21:46:51 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiff2ps.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/tiffcmp.c b/tools/tiffcmp.c
index 81b84e3d..b99b9f7c 100644
--- a/tools/tiffcmp.c
+++ b/tools/tiffcmp.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiffcmp.c,v 1.30 1997/08/29 21:46:51 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiffcmp.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
index fc9ea4b8..2915b184 100644
--- a/tools/tiffcp.c
+++ b/tools/tiffcp.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiffcp.c,v 1.54 1997/09/01 03:22:05 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiffcp.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/tiffdither.c b/tools/tiffdither.c
index 524de264..f28d5b65 100644
--- a/tools/tiffdither.c
+++ b/tools/tiffdither.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiffdither.c,v 1.27 1997/08/29 21:46:52 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiffdither.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/tiffdump.c b/tools/tiffdump.c
index 3ff9f595..1fb784f8 100644
--- a/tools/tiffdump.c
+++ b/tools/tiffdump.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiffdump.c,v 1.53 1997/08/29 21:46:53 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiffdump.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c
index 01e66d83..bd01532f 100644
--- a/tools/tiffinfo.c
+++ b/tools/tiffinfo.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiffinfo.c,v 1.28 1997/08/29 21:46:54 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiffinfo.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff --git a/tools/tiffmedian.c b/tools/tiffmedian.c
index 31eaca47..f2b49f5b 100644
--- a/tools/tiffmedian.c
+++ b/tools/tiffmedian.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiffmedian.c,v 1.19 1997/08/29 22:35:33 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiffmedian.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Apply median cut on an image.
diff --git a/tools/tiffsplit.c b/tools/tiffsplit.c
index 6bdd5215..c5ba69bc 100644
--- a/tools/tiffsplit.c
+++ b/tools/tiffsplit.c
@@ -1,4 +1,4 @@
-/* $Header: /d1/sam/tiff/tools/RCS/tiffsplit.c,v 1.14 1997/08/29 21:46:55 sam Exp $ */
+/* $Header: /usr/local/cvs/internal/libtiff/tools/tiffsplit.c,v 1.1.1.1 1999/07/27 21:50:28 mike Exp $ */
 
 /*
  * Copyright (c) 1992-1997 Sam Leffler
-- 
cgit v1.2.1