libtiff: v3.5.2 release

From 4e500fc403b41416d3febb9aec42af4c01f5ea47 Mon Sep 17 00:00:00 2001
From: Mike Welles <[EMAIL REDACTED]>
Date: Tue, 28 Sep 1999 17:22:20 +0100
Subject: [PATCH] v3.5.2 release

---
 CVS/Entries                          |  22 -
 CVS/Repository                       |   1 -
 CVS/Root                             |   1 -
 Makefile.in                          |  81 +--
 README                               |   3 +-
 README-IPTC                          |  41 --
 README-v3.5.1                        |   8 -
 TODO                                 |   2 +-
 VERSION                              |   2 +-
 config.guess                         |   3 +
 config.site                          |   6 +-
 configure                            |  14 +-
 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/addtiffo/Makefile            |  27 +
 contrib/addtiffo/Makefile.vc         |  27 +
 contrib/addtiffo/README              | 145 +++++
 contrib/addtiffo/addtiffo.c          | 115 ++++
 contrib/addtiffo/rawblockedimage.cpp | 403 ++++++++++++
 contrib/addtiffo/rawblockedimage.h   | 108 ++++
 contrib/addtiffo/tif_overview.cpp    | 559 ++++++++++++++++
 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 1107 -> 0 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.alpha                      |   2 +-
 dist/tiff.spec                       |   2 +-
 dist/tiff.version                    |   2 +-
 html/CVS/Entries                     |  27 -
 html/CVS/Repository                  |   1 -
 html/CVS/Root                        |   1 -
 html/Makefile.in                     |   2 +-
 html/build.html                      |   4 +-
 html/document.html                   |   4 +-
 html/images/CVS/Entries              |  17 -
 html/images/CVS/Repository           |   1 -
 html/images/CVS/Root                 |   1 -
 html/index.html                      |  33 +-
 html/v3.5.1.html                     |  75 ---
 libtiff/CVS/Entries                  |  57 --
 libtiff/CVS/Repository               |   1 -
 libtiff/CVS/Root                     |   1 -
 libtiff/Makefile.in                  |  16 +-
 libtiff/Makefile.lcc                 |   2 +-
 libtiff/makefile.vc                  |  79 +++
 libtiff/mkg3states.c                 |   2 +-
 libtiff/mkspans.c                    |   2 +-
 libtiff/mkversion.c                  |   4 +-
 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                    |  58 +-
 libtiff/tif_dir.h                    |   2 +-
 libtiff/tif_dirinfo.c                |   2 +-
 libtiff/tif_dirread.c                |  26 +-
 libtiff/tif_dirwrite.c               |  27 +-
 libtiff/tif_dumpmode.c               |   2 +-
 libtiff/tif_error.c                  |   2 +-
 libtiff/tif_fax3.c                   |  26 +-
 libtiff/tif_fax3.h                   |  10 +-
 libtiff/tif_flush.c                  |   2 +-
 libtiff/tif_getimage.c               | 226 ++++++-
 libtiff/tif_jpeg.c                   |   2 +-
 libtiff/tif_luv.c                    |   7 +-
 libtiff/tif_lzw.c                    |   4 +-
 libtiff/tif_msdos.c                  |   2 +-
 libtiff/tif_next.c                   |   2 +-
 libtiff/tif_open.c                   |   4 +-
 libtiff/tif_packbits.c               |   2 +-
 libtiff/tif_predict.c                |   2 +-
 libtiff/tif_predict.h                |   2 +-
 libtiff/tif_print.c                  |   2 +-
 libtiff/tif_read.c                   |   4 +-
 libtiff/tif_strip.c                  |   2 +-
 libtiff/tif_swab.c                   |   2 +-
 libtiff/tif_thunder.c                |   2 +-
 libtiff/tif_tile.c                   |   2 +-
 libtiff/tif_unix.c                   |   8 +-
 libtiff/tif_version.c                |   2 +-
 libtiff/tif_vms.c                    |   2 +-
 libtiff/tif_warning.c                |   2 +-
 libtiff/tif_win3.c                   |   2 +-
 libtiff/tif_win32.c                  |  21 +-
 libtiff/tif_write.c                  |   2 +-
 libtiff/tif_zip.c                    |   2 +-
 libtiff/tiff.h                       |  10 +-
 libtiff/tiffcomp.h                   |   2 +-
 libtiff/tiffconf.h                   |   2 +-
 libtiff/tiffio.h                     |  10 +-
 libtiff/tiffiop.h                    |   2 +-
 man/CVS/Entries                      |  56 --
 man/CVS/Repository                   |   1 -
 man/CVS/Root                         |   1 -
 man/Makefile.in                      |   8 +-
 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                 |   6 +-
 man/TIFFReadDirectory.3t             |   2 +-
 man/TIFFReadEncodedStrip.3t          |   2 +-
 man/TIFFReadEncodedTile.3t           |   2 +-
 man/TIFFReadRGBAImage.3t             |   6 +-
 man/TIFFReadRGBAStrip.3t             | 176 +++++
 man/TIFFReadRGBATile.3t              | 178 ++++++
 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                       |  10 +-
 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 -
 test_pics.sh                         |  29 +
 tiff.h                               | 421 ------------
 tools/CVS/Entries                    |  26 -
 tools/CVS/Repository                 |   1 -
 tools/CVS/Root                       |   1 -
 tools/Makefile.in                    |  10 +-
 tools/Makefile.lcc                   |   7 +-
 tools/Makefile.vc                    |  28 +
 tools/fax2ps.c                       |  12 +-
 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/tiff2rgba.c                    | 452 +++++++++++++
 tools/tiffcmp.c                      |   2 +-
 tools/tiffcp.c                       | 109 +++-
 tools/tiffdither.c                   |   2 +-
 tools/tiffdump.c                     |   2 +-
 tools/tiffinfo.c                     |   2 +-
 tools/tiffmedian.c                   |   2 +-
 tools/tiffsplit.c                    |   2 +-
 259 files changed, 3831 insertions(+), 2194 deletions(-)
 delete mode 100644 CVS/Entries
 delete mode 100644 CVS/Repository
 delete mode 100644 CVS/Root
 delete mode 100644 README-IPTC
 delete mode 100644 README-v3.5.1
 delete mode 100644 contrib/CVS/Entries
 delete mode 100644 contrib/CVS/Repository
 delete mode 100644 contrib/CVS/Root
 delete mode 100644 contrib/acorn/CVS/Entries
 delete mode 100644 contrib/acorn/CVS/Repository
 delete mode 100644 contrib/acorn/CVS/Root
 create mode 100644 contrib/addtiffo/Makefile
 create mode 100755 contrib/addtiffo/Makefile.vc
 create mode 100644 contrib/addtiffo/README
 create mode 100644 contrib/addtiffo/addtiffo.c
 create mode 100644 contrib/addtiffo/rawblockedimage.cpp
 create mode 100644 contrib/addtiffo/rawblockedimage.h
 create mode 100644 contrib/addtiffo/tif_overview.cpp
 delete mode 100644 contrib/dbs/CVS/Entries
 delete mode 100644 contrib/dbs/CVS/Repository
 delete mode 100644 contrib/dbs/CVS/Root
 delete mode 100644 contrib/dbs/xtiff/CVS/Entries
 delete mode 100644 contrib/dbs/xtiff/CVS/Repository
 delete mode 100644 contrib/dbs/xtiff/CVS/Root
 delete mode 100644 contrib/dosdjgpp/CVS/Entries
 delete mode 100644 contrib/dosdjgpp/CVS/Repository
 delete mode 100644 contrib/dosdjgpp/CVS/Root
 delete mode 100644 contrib/iptcutil/CVS/Entries
 delete mode 100644 contrib/iptcutil/CVS/Repository
 delete mode 100644 contrib/iptcutil/CVS/Root
 delete mode 100644 contrib/iptcutil/Makefile
 delete mode 100644 contrib/iptcutil/iptcutil.c
 delete mode 100644 contrib/iptcutil/test.iptc
 delete mode 100644 contrib/iptcutil/test.txt
 delete mode 100644 contrib/mac-cw/CVS/Entries
 delete mode 100644 contrib/mac-cw/CVS/Repository
 delete mode 100644 contrib/mac-cw/CVS/Root
 delete mode 100644 contrib/mac-mpw/CVS/Entries
 delete mode 100644 contrib/mac-mpw/CVS/Repository
 delete mode 100644 contrib/mac-mpw/CVS/Root
 delete mode 100644 contrib/mfs/CVS/Entries
 delete mode 100644 contrib/mfs/CVS/Repository
 delete mode 100644 contrib/mfs/CVS/Root
 delete mode 100644 contrib/pds/CVS/Entries
 delete mode 100644 contrib/pds/CVS/Repository
 delete mode 100644 contrib/pds/CVS/Root
 delete mode 100644 contrib/ras/CVS/Entries
 delete mode 100644 contrib/ras/CVS/Repository
 delete mode 100644 contrib/ras/CVS/Root
 create mode 100644 contrib/tags/Makefile.gcc
 create mode 100644 contrib/tags/Makefile.mpw
 create mode 100644 contrib/tags/README
 create mode 100644 contrib/tags/listtif.c
 create mode 100644 contrib/tags/maketif.c
 create mode 100644 contrib/tags/xtif_dir.c
 create mode 100644 contrib/tags/xtiffio.h
 create mode 100644 contrib/tags/xtiffiop.h
 delete mode 100644 contrib/vms/CVS/Entries
 delete mode 100644 contrib/vms/CVS/Repository
 delete mode 100644 contrib/vms/CVS/Root
 delete mode 100644 contrib/vms/libtiff/CVS/Entries
 delete mode 100644 contrib/vms/libtiff/CVS/Repository
 delete mode 100644 contrib/vms/libtiff/CVS/Root
 delete mode 100644 contrib/vms/tools/CVS/Entries
 delete mode 100644 contrib/vms/tools/CVS/Repository
 delete mode 100644 contrib/vms/tools/CVS/Root
 delete mode 100644 contrib/win32/CVS/Entries
 delete mode 100644 contrib/win32/CVS/Repository
 delete mode 100644 contrib/win32/CVS/Root
 delete mode 100644 contrib/win95/CVS/Entries
 delete mode 100644 contrib/win95/CVS/Repository
 delete mode 100644 contrib/win95/CVS/Root
 delete mode 100644 contrib/winnt/CVS/Entries
 delete mode 100644 contrib/winnt/CVS/Repository
 delete mode 100644 contrib/winnt/CVS/Root
 delete mode 100644 dist/CVS/Entries
 delete mode 100644 dist/CVS/Repository
 delete mode 100644 dist/CVS/Root
 delete mode 100644 html/CVS/Entries
 delete mode 100644 html/CVS/Repository
 delete mode 100644 html/CVS/Root
 delete mode 100644 html/images/CVS/Entries
 delete mode 100644 html/images/CVS/Repository
 delete mode 100644 html/images/CVS/Root
 delete mode 100644 html/v3.5.1.html
 delete mode 100644 libtiff/CVS/Entries
 delete mode 100644 libtiff/CVS/Repository
 delete mode 100644 libtiff/CVS/Root
 create mode 100644 libtiff/makefile.vc
 delete mode 100644 man/CVS/Entries
 delete mode 100644 man/CVS/Repository
 delete mode 100644 man/CVS/Root
 create mode 100644 man/TIFFReadRGBAStrip.3t
 create mode 100644 man/TIFFReadRGBATile.3t
 delete mode 100644 port/CVS/Entries
 delete mode 100644 port/CVS/Repository
 delete mode 100644 port/CVS/Root
 delete mode 100644 port/irix/CVS/Entries
 delete mode 100644 port/irix/CVS/Repository
 delete mode 100644 port/irix/CVS/Root
 create mode 100755 test_pics.sh
 delete mode 100644 tiff.h
 delete mode 100644 tools/CVS/Entries
 delete mode 100644 tools/CVS/Repository
 delete mode 100644 tools/CVS/Root
 create mode 100644 tools/Makefile.vc
 create mode 100644 tools/tiff2rgba.c

diff --git a/CVS/Entries b/CVS/Entries
deleted file mode 100644
index 3d24eeeb..00000000
--- a/CVS/Entries
+++ /dev/null
@@ -1,22 +0,0 @@
-/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
deleted file mode 100644
index 355fc430..00000000
--- a/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/cvs/internal/libtiff
diff --git a/CVS/Root b/CVS/Root
deleted file mode 100644
index 8dff0f68..00000000
--- a/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/cvs
diff --git a/Makefile.in b/Makefile.in
index c5e4941e..1d47b65d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #! smake
-#	$Header: /usr/local/cvs/internal/libtiff/Makefile.in,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $
+#	$Header: /cvsroot/osrs/libtiff/Makefile.in,v 1.5 1999/09/28 17:22:20 mwelles Exp $
 #
 # @WARNING@
 #
@@ -120,11 +120,13 @@ TIFFFILES=\
 	VERSION					\
 	COPYRIGHT				\
 	TODO					\
+	test_pics.sh				\
 	dist/tiff.spec				\
 	    dist/newalpha			\
 	    dist/newversion			\
 	libtiff/Makefile.in			\
 	    libtiff/Makefile.lcc		\
+	    libtiff/makefile.vc			\
 	    libtiff/t4.h			\
 	    libtiff/tiff.h			\
 	    libtiff/tiffcomp.h			\
@@ -184,6 +186,7 @@ TIFFFILES=\
 	    port/strcasecmp.c			\
 	    port/strtoul.c			\
 	tools/Makefile.in			\
+	    tools/Makefile.vc			\
 	    tools/Makefile.lcc			\
 	    tools/fax2tiff.c			\
 	    tools/fax2ps.c			\
@@ -198,6 +201,7 @@ TIFFFILES=\
 	    tools/sgisv.c			\
 	    tools/thumbnail.c			\
 	    tools/tiff2bw.c			\
+	    tools/tiff2rgba.c			\
 	    tools/tiff2ps.c			\
 	    tools/tiffcmp.c			\
 	    tools/tiffcp.c			\
@@ -238,6 +242,8 @@ TIFFFILES=\
 	    man/TIFFReadEncodedStrip.3t		\
 	    man/TIFFReadEncodedTile.3t		\
 	    man/TIFFReadRGBAImage.3t		\
+	    man/TIFFReadRGBAStrip.3t		\
+	    man/TIFFReadRGBATile.3t		\
 	    man/TIFFReadRawStrip.3t		\
 	    man/TIFFReadRawTile.3t		\
 	    man/TIFFReadScanline.3t		\
@@ -380,6 +386,13 @@ CONTRIBFILES=\
 	    contrib/pds/tif_imageiter.h		\
 	    contrib/pds/tif_pdsdirread.c	\
 	    contrib/pds/tif_pdsdirwrite.c	\
+	contrib/addtiffo/README			\
+	    contrib/addtiffo/Makefile		\
+	    contrib/addtiffo/Makefile.vc	\
+	    contrib/addtiffo/addtiffo.c		\
+	    contrib/addtiffo/tif_overview.cpp	\
+	    contrib/addtiffo/rawblockedimage.cpp \
+	    contrib/addtiffo/rawblockedimage.h  \
 	${NULL}
 DISTFILES=\
 	${TIFFFILES}				\
@@ -401,64 +414,23 @@ CONFIG=\
 rcsclean:
 	rcsclean ${TIFFFILES} && co ${TIFFFILES}
 
-alpha:
-	(cd ${SRCDIR}/dist; sh newversion)
-	-${MAKE} clean
-	${MAKE} alpha.stamp
-	${SRCDIR}/configure ${CONFIG}
-	${MAKE} product
-	${MAKE} alpha.tar
-
-# stamp relevant files according to current alpha
-alpha.stamp:
-	VERSION="Alpha@DIST_ALPHA@";					\
-	NOW=`date`;							\
-	for i in ${TIFFFILES}; do					\
-	    REV=`rlog -h -d"$$NOW" ${SRCDIR}/$$i|fgrep 'head:'|awk '{print $$2}'`;\
-	    rcs "-N$$VERSION:$$REV" "-sExp:$$REV" ${SRCDIR}/$$i && co -sExp ${SRCDIR}/$$i;	\
-	done
-
-purge-old-alphas:
-	VERSIONS=`awk 'BEGIN {						\
-		for (i=1; i<=@DIST_ALPHA@; i++) printf " -nAlpha%03d",i;\
-		exit							\
-	    }'`;							\
-	for i in ${TIFFFILES}; do					\
-	    echo rcs $$VERSIONS ${SRCDIR}/$$i;				\
-	    rcs $$VERSIONS ${SRCDIR}/$$i && co ${SRCDIR}/$$i;		\
-	done
-
-alphadiff:
-	-@for i in ${TIFFFILES}; do					\
-	    rcsdiff -r${ALPHA} ${SRCDIR}/$$i;				\
-	done
-
-# create alpha distribution archive
-alpha.tar:
-	VERSION="@VERSION@";						\
-	rm -f tiff-$$VERSION $$VERSION $$VERSION-tar;			\
-	ln -s ${SRCDIR} tiff-$$VERSION;					\
-	(for i in ${DISTFILES}; do					\
-	   echo $$i;							\
-	done) | sed "s;.*;tiff-$$VERSION/&;" >$$VERSION;		\
-	tar cvf $$VERSION-tar `cat $$VERSION`;				\
-	rm -f tiff-$$VERSION-tar.${ZIPSUF};				\
-	cat $$VERSION-tar | ${COMPRESS} >tiff-$$VERSION-tar.${ZIPSUF};	\
-	rm -f tiff-$$VERSION $$VERSION $$VERSION-tar;
-
 release:
 	(cd ${SRCDIR}/dist; sh newversion)
 	-${MAKE} clean
 	${MAKE} release.stamp
 	${SRCDIR}/configure ${CONFIG}
-	${MAKE} product
+#	${MAKE} product
 	${MAKE} release.tar
 
+# stamp relevant files according to current alpha
 release.stamp:
-	NOW=`date`;							\
-	for i in ${TIFFFILES}; do					\
-	    REV=`rlog -h -d"$$NOW" ${SRCDIR}/$$i|fgrep 'head:'|awk '{print $$2}'`;\
-	    rcs "-NRelease@DIST_MAJOR@_@DIST_MINOR@_@DIST_TYPE@:$$REV" "-sRel:$$REV" ${SRCDIR}/$$i && co -sRel ${SRCDIR}/$$i;	\
+	cvs tag -R "Release" 
+	date "+%m/%d/%Y" > RELEASE-DATE
+
+#diffs since last release
+releasediff:
+	-@for i in ${TIFFFILES}; do					\
+	    cvs diff -D`cat RELEASE-DATE` ${SRCDIR}/$$i;				\
 	done
 
 # create release distribution archive
@@ -474,6 +446,13 @@ release.tar:
 	cat $$VERSION-tar | ${COMPRESS} >tiff-$$VERSION-tar.${ZIPSUF};	\
 	rm -f tiff-$$VERSION $$VERSION $$VERSION-tar;
 
+#
+#	Simple rule to run test suite assuming that pics directory is 
+#	just below this one, and that .rpt files are available. 
+#
+test:
+	test_pics.sh pics/*.tif
+
 #
 # Create a package of the test images.
 #
diff --git a/README b/README
index 339494ec..b35f81a9 100644
--- a/README
+++ b/README
@@ -1,4 +1,5 @@
-$Header: /usr/local/cvs/internal/libtiff/README,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $
+$Header: /cvsroot/osrs/libtiff/README,v 1.2 1999/08/16 17:09:27 warmerda Exp $
+
 
 TIFF Software Distribution
 --------------------------
diff --git a/README-IPTC b/README-IPTC
deleted file mode 100644
index c70f5ff5..00000000
--- a/README-IPTC
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index b51914d2..00000000
--- a/README-v3.5.1
+++ /dev/null
@@ -1,8 +0,0 @@
-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 6ce2c815..5ddb4ff1 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-#	$Header: /usr/local/cvs/internal/libtiff/TODO,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $
+#	$Header: /cvsroot/osrs/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 d5c0c991..87ce4929 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.1
+3.5.2
diff --git a/config.guess b/config.guess
index 75907e0d..1c1fbc71 100755
--- a/config.guess
+++ b/config.guess
@@ -264,6 +264,9 @@ EOF
     hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    i[345]86:CYGWIN*:*:*)
+	echo ${UNAME_MACHINE}-unknown-Cygwin${UNAME_RELEASE}
+	exit 0 ;;
     i[34]86:BSD/386:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
diff --git a/config.site b/config.site
index e60d56b6..2180044b 100644
--- a/config.site
+++ b/config.site
@@ -1,4 +1,4 @@
-# $Header: /usr/local/cvs/internal/libtiff/config.site,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $
+# $Header: /cvsroot/osrs/libtiff/config.site,v 1.2 1999/09/26 22:03:46 mwelles Exp $
 #
 # TIFF Software
 #
@@ -94,8 +94,8 @@
 # JPEG support requires release 5 or later of the IJG code,
 # which you can find on the Internet at ftp.uu.net:/graphics/jpeg/.
 #
-#DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-5a" # directory for jpeg include files
-#DIR_JPEGLIB=../src/jpeg-5a		# directory for libjpeg
+#DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files
+#DIR_JPEGLIB=../src/jpeg-6b		# directory for libjpeg
 
 #
 # Deflate-specific parameters; used when Deflate support is enabled (see above).
diff --git a/configure b/configure
index b9fa7eda..3880d1f5 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Header: /usr/local/cvs/internal/libtiff/configure,v 1.1.1.1 1999/07/27 21:50:26 mike Exp $
+#	$Header: /cvsroot/osrs/libtiff/configure,v 1.2 1999/09/08 12:32:18 warmerda 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.1.1.1 $"
+	echo "This is TIFF configure $Revision: 1.2 $"
 	exit 0
 	;;
     -help|--help)		usage; exit 0;;
@@ -1100,7 +1100,13 @@ if [ "$DSO" = auto ]; then
 	if (findApp rld /lib:/usr/lib:$PATH) >/dev/null 2>&1; then
 	    DSOSUF=so
 	    DSOLD="${CCOMPILER} ${ENVOPTS}"
-	    DSOOPTS='-shared -rdata_shared -check_registry ${SRCDIR}/port/irix/so_locations -quickstart_info'
+            if [ $ISGCC = yes ]; then
+               LIBCOPTS="-fpic"
+               DSOOPTS='-shared -rdata_shared'
+            else
+               LIBCOPTS="-KPIC"
+               DSOOPTS='-shared -rdata_shared -check_registry ${SRCDIR}/port/irix/so_locations -quickstart_info'
+            fi
 	    DSO=IRIX
 	    TIFFLIBREF='-L${DEPTH}/libtiff -rpath '${DIR_LIB}' -ltiff'
 	fi
@@ -1158,7 +1164,7 @@ if [ "$DSO" = auto ]; then
 	    DSO=LINUX
 	fi
 	;;
-    *-osf3*)
+    *-osf3*|*-osf4*)
 	DSOSUF=so
 	DSOOPTS='-shared'
 	DSO=OSF
diff --git a/contrib/CVS/Entries b/contrib/CVS/Entries
deleted file mode 100644
index ab0ad631..00000000
--- a/contrib/CVS/Entries
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index ae63d111..00000000
--- a/contrib/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/cvs/internal/libtiff/contrib
diff --git a/contrib/CVS/Root b/contrib/CVS/Root
deleted file mode 100644
index 8dff0f68..00000000
--- a/contrib/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/cvs
diff --git a/contrib/acorn/CVS/Entries b/contrib/acorn/CVS/Entries
deleted file mode 100644
index 442bb996..00000000
--- a/contrib/acorn/CVS/Entries
+++ /dev/null
@@ -1,7 +0,0 @@
-/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
deleted file mode 100644
index f1a274a6..00000000
--- a/contrib/acorn/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/cvs/internal/libtiff/contrib/acorn
diff --git a/contrib/acorn/CVS/Root b/contrib/acorn/CVS/Root
deleted file mode 100644
index 8dff0f68..00000000
--- a/contrib/acorn/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/cvs
diff --git a/contrib/addtiffo/Makefile b/contrib/addtiffo/Makefile
new file mode 100644
index 00000000..81759b42
--- /dev/null
+++ b/contrib/addtiffo/Makefile
@@ -0,0 +1,27 @@
+#
+# If libtiff.a is installed in /usr/lib or /usr/local/lib just point
+# LIBTIFF_DIR there.  It doesn't need a full libtiff tree.
+#
+LIBTIFF_DIR =	../../libtiff
+#
+CC	=	gcc
+CXX	=	gcc
+CFLAGS	=	-O -I$(LIBTIFF_DIR)
+LIBS	=	$(LIBTIFF_DIR)/libtiff.a -lm
+
+addtiffo:	addtiffo.o tif_overview.o rawblockedimage.o
+	$(CXX) $(CFLAGS) addtiffo.o tif_overview.o rawblockedimage.o \
+		$(LIBS) -o addtiffo 
+
+
+addtiffo.o:	addtiffo.c
+	$(CC) -c $(CFLAGS) addtiffo.c
+
+tif_overview.o:	tif_overview.cpp
+	$(CXX) -c $(CFLAGS) tif_overview.cpp
+
+rawblockedimage.o:	rawblockedimage.cpp
+	$(CXX) -c $(CFLAGS) rawblockedimage.cpp
+
+clean:
+	rm *.o addtiffo
diff --git a/contrib/addtiffo/Makefile.vc b/contrib/addtiffo/Makefile.vc
new file mode 100755
index 00000000..32b489b3
--- /dev/null
+++ b/contrib/addtiffo/Makefile.vc
@@ -0,0 +1,27 @@
+#
+# If libtiff.a is installed in /usr/lib or /usr/local/lib just point
+# LIBTIFF_DIR there.  It doesn't need a full libtiff tree.
+#
+LIBTIFF_DIR =	..\..\libtiff
+#
+CC	=	cl.exe
+CPPC	=	cl.exe
+CFLAGS	=	-O -I$(LIBTIFF_DIR)
+LIBS	=	$(LIBTIFF_DIR)\tiff.lib
+
+addtiffo:	addtiffo.obj tif_overview.obj rawblockedimage.obj
+	$(CC) $(CFLAGS) addtiffo.obj tif_overview.obj rawblockedimage.obj \
+		$(LIBS) /Feaddtiffo.exe
+
+
+addtiffo.obj:	addtiffo.c
+	$(CC) -c $(CFLAGS) addtiffo.c
+
+tif_overview.obj:	tif_overview.cpp
+	$(CPPC) -c $(CFLAGS) tif_overview.cpp
+
+rawblockedimage.obj:	rawblockedimage.cpp
+	$(CPPC) -c $(CFLAGS) rawblockedimage.cpp
+
+clean:
+	del *.obj addtiffo.exe
diff --git a/contrib/addtiffo/README b/contrib/addtiffo/README
new file mode 100644
index 00000000..

(Patch may be truncated, please check the link at the top of this post.)