From 00c28dda69f1be886da146b085f795478d661ddf Mon Sep 17 00:00:00 2001
From: Mike Welles <[EMAIL REDACTED]>
Date: Tue, 27 Jul 1999 21:50:28 +0100
Subject: [PATCH] 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 <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#ifdef WIN32
+#include <io.h>
+#endif
+#include <string.h>
+#include <memory.h>
+#include <ctype.h>
+
+#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
(Patch may be truncated, please check the link at the top of this post.)