libtiff: v3.4beta032 release

From c205122210e4b59a8501753601b74e68acf37f00 Mon Sep 17 00:00:00 2001
From: Sam Leffler <[EMAIL REDACTED]>
Date: Tue, 9 Apr 1996 17:37:14 +0100
Subject: [PATCH] v3.4beta032 release

---
 Makefile.in                                   |    5 +-
 configure                                     |  186 ++-
 .../Makefile.acorn => contrib/acorn/Makefile  |   79 +-
 contrib/acorn/ReadMe                          |    0
 contrib/acorn/cleanlib                        |    5 +
 contrib/acorn/convert                         |    0
 contrib/acorn/install                         |    8 +-
 dist/tiff.alpha                               |    2 +-
 html/Makefile.in                              |    4 +-
 html/build.html                               |   12 +-
 html/index.html                               |    4 +-
 html/internals.html                           |   12 +-
 html/libtiff.html                             |    5 +-
 html/misc.html                                |    6 +-
 html/support.html                             |    3 +-
 html/v3.4beta032.html                         |   89 ++
 libtiff/Makefile.in                           |    6 +-
 libtiff/tif_codec.c                           |    6 +-
 libtiff/tif_dirread.c                         |    6 +-
 libtiff/tif_dirwrite.c                        |   25 +-
 libtiff/tif_pixarlog.c                        | 1300 +++++++++++++++++
 libtiff/tif_vms.c                             |   25 +-
 libtiff/tiff.h                                |   11 +-
 libtiff/tiffconf.h                            |    3 +-
 libtiff/tiffiop.h                             |    5 +-
 tools/tiffdump.c                              |    8 +-
 26 files changed, 1670 insertions(+), 145 deletions(-)
 rename libtiff/Makefile.acorn => contrib/acorn/Makefile (73%)
 mode change 100755 => 100644
 mode change 100755 => 100644 contrib/acorn/ReadMe
 create mode 100755 contrib/acorn/cleanlib
 mode change 100755 => 100644 contrib/acorn/convert
 create mode 100644 html/v3.4beta032.html
 create mode 100644 libtiff/tif_pixarlog.c

diff --git a/Makefile.in b/Makefile.in
index 6e7e9a40..2c33274e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #! smake
-#	$Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.45 1996/03/18 22:21:38 sam Exp $
+#	$Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.48 1996/04/09 17:37:14 sam Exp $
 #
 # @WARNING@
 #
@@ -113,7 +113,6 @@ TIFFFILES=\
 	libtiff/Makefile.in			\
 	    libtiff/Makefile.lcc		\
 	    libtiff/Makefile.msc		\
-	    libtiff/Makefile.acorn		\
 	    libtiff/t4.h			\
 	    libtiff/tiff.h			\
 	    libtiff/tiffcomp.h			\
@@ -147,6 +146,7 @@ TIFFFILES=\
 	    libtiff/tif_next.c			\
 	    libtiff/tif_open.c			\
 	    libtiff/tif_packbits.c		\
+	    libtiff/tif_pixarlog.c		\
 	    libtiff/tif_predict.h		\
 	    libtiff/tif_predict.c		\
 	    libtiff/tif_print.c			\
@@ -260,6 +260,7 @@ TIFFFILES=\
 	    html/misc.html			\
 	    html/support.html			\
 	    html/tools.html			\
+	    html/v3.4beta032.html		\
 	    html/v3.4beta031.html		\
 	    html/v3.4beta029.html		\
 	    html/v3.4beta028.html		\
diff --git a/configure b/configure
index 31e9bd1f..a5b18716 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Header: /usr/people/sam/tiff/RCS/configure,v 1.45 1996/03/19 18:26:58 sam Exp $
+#	$Header: /usr/people/sam/tiff/RCS/configure,v 1.47 1996/04/09 16:41:22 sam Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@@ -33,31 +33,40 @@
 # preparation for building TIFF source.
 #
 
+POSIXLY_CORRECT=1; export POSIXLY_CORRECT	# disable GNU extensions
+
+QUIET=no				# suppress messages to tty
+NONINTERACTIVE=no			# control prompting of config params
+SITE=					# dir where config.site is located
+TARGET=					# target system identity
+SRCDIR=					# dir where source is located
+
 #
 # Setup general configuration parameters.
 #
-DIR_BIN=/usr/local/bin
-DIR_LIB=/usr/local/lib
-DIR_INC=/usr/local/include
-DIRS_LIBINC=
-DIR_JPEGLIB=
-DIR_GZLIB=
-DSO=auto
+DIR_BIN=/usr/local/bin			# destination for applications
+DIR_LIB=/usr/local/lib			# destination for library
+DIR_INC=/usr/local/include		# destination for include files
+DIRS_LIBINC=				# dirs to search for ancillary includes
+DIR_JPEGLIB=				# dir for IJG -ljpeg
+DIR_GZLIB=				# dir for zlib -lgz
+DSO=auto				# auto-enable DSO support
 LIBCOPTS=				# library-specific C-compiler options
-JPEG=no
-ZIP=no
-PORT=auto
-LIBGL=auto
-LIBIMAGE=auto
-MACHDEPLIBS=-lm
-
+JPEG=no					# configure JPEG support
+ZIP=no					# configure ZIP/Deflate support
+PORT=auto				# enable portability emulations
+LIBGL=auto				# auto-enable build of SGI -lgl apps
+LIBIMAGE=auto				# auto-enable build of SGI -limage apps
+MACHDEPLIBS=-lm				# machine-dependent libraries for apps
+: ${CC=}				# name of C compiler to use
+: ${CCOMPILER=}				# full pathname of C compiler
+: ${ENVOPTS=}				# CC opts for ANSI C compilation
 : ${MAKE=make}				# make to use
+
 # screws up the test of `-f -'
 : ${MAKEFLAGS=}				# unset MAKEFLAGS
 RM="rm -f"
 
-POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
-
 #
 # Error diagnostics that should go to the terminal are
 # done with this interface (or cat).
@@ -94,11 +103,6 @@ Options: [defaults in brackets after descriptions]
 EOF
 }
 
-QUIET=no
-NONINTERACTIVE=no
-SITE=
-TARGET=
-SRCDIR=
 #
 # Crack command line arguments.  We purposely
 # use syntax and options that are compatible
@@ -141,7 +145,7 @@ do
     -target|--target)		ac_prev=TARGET;;
     -target=*|--target=*)	TARGET="$ac_optarg" ;;
     -version|--version)
-	echo "This is TIFF configure $Revision: 1.45 $"
+	echo "This is TIFF configure $Revision: 1.47 $"
 	exit 0
 	;;
     -help|--help)		usage; exit 0;;
@@ -227,6 +231,8 @@ captureX()
 }
 
 date >&5
+echo Running "$0" with arguments: "$@" >&5
+
 cat 1>&5 <<'EOF'
 
 This file contains information that is captured from running the configure
@@ -293,26 +299,30 @@ fi
 #
 # Emulate old-style settups...
 #
-test -z "${DIR_JPEG:-}"  || {
+test -z "${DIR_JPEG-}"  || {
     DIRS_LIBINC="${DIRS_LIBINC} ${DIR_JPEG}"
-    DIR_JPEGLIB=${DIR_JPEG}
+    DIR_JPEGLIB="${DIR_JPEG}"
 }
-test -z "${DIR_LIBGZ:-}" || {
+test -z "${DIR_LIBGZ-}" || {
     DIRS_LIBINC="${DIRS_LIBINC} ${DIR_LIBGZ}"
-    DIR_GZLIB=${DIR_LIBGZ}
+    DIR_GZLIB="${DIR_LIBGZ}"
 }
 
 identifyTarget()
 {
     random=`date | awk '{print $4}' | sed -e 's/.*://'` 2>/dev/null
     case "$random" in
-    1*)	Note "Wow, you've got a $1 system!";;
-    2*)	Note "Hmm, looks like a $1 system.";;
-    3*)	Note "Oh no, not another $1 system...";;
-    4*)	Note "Well I'll be, a $1 system.";;
-    5*)	Note "Fee, fie, foe, this smells like a $1 system.";;
-    *)	Note "Gosh, aren't you lucky to have a $1 system!";;
-    esac
+    *0) Note "Wow, you've got a $1 system!";;
+    *1) Note "Hmm, looks like a $1 system.";;
+    *2) Note "Oh no, not another $1 system...";;
+    *3) Note "Well I'll be, a $1 system.";;
+    *4) Note "Fee, fie, foe, this smells like a $1 system.";;
+    *5)	Note "Gosh, aren't you lucky to have a $1 system!";;
+    *6)	Note "YOW!!  Did something bad happen or am I on a $1 system?";;
+    *7)	Note "Do they really still make $1 systems?!";;
+    *8)	Note "I'm always happy to encounter another $1 system.";;
+    *9)	Note "Here we are again, this time on a $1 system.";;
+esac
 }
 
 #
@@ -335,7 +345,7 @@ else
     Note "Warning, I don't seem to have the GNU config.sub script to canonicalize"
     Note "your target specification; this may cause problems later on..."
 fi
-if [ -z "${FILLORDER:-}" ]; then
+if [ -z "${FILLORDER-}" ]; then
     #
     # Host bit order within a word.
     #
@@ -352,15 +362,16 @@ fi
 #
 findThing()
 {
-    t="$1"; app=$2; path=$3;
-    case $app in
-    /*) eval $t $app && { echo $app; return; };;
+    t="$1"; app="$2"; path="$3";
+    case "$app" in
+    /*) eval "$t" "$app" && { echo "$app"; return; };;
     esac
-    IFS=:
+    (IFS=:
     for i in $path; do
-	eval $t $i/$app && { echo $i/$app; return 0; }
+	eval "$t" "$i/$app" && { echo "$i/$app"; return 0; }
     done
     return 1
+    )
 }
 
 #
@@ -368,7 +379,7 @@ findThing()
 #
 findFile()
 {
-    findThing "test -f" $1 $2
+    findThing "test -f" "$1" "$2"
 }
 
 #
@@ -483,7 +494,7 @@ checkCompiler()
     # be combined with above checks so we only
     # select an ANSI C compiler.
     #
-    if [ -z "${ENVOPTS:-}" ]; then
+    if [ -z "${ENVOPTS-}" ]; then
 	case $ISGCC-$TARGET in
 	no-*-irix*)	C_ANSI="-ansi";;
 	no-*-hp*)	C_ANSI="-Aa -D_HPUX_SOURCE -Dhpux";;
@@ -497,8 +508,8 @@ checkCompiler()
     $RM dummy dummy.o
     capture $compiler -o dummy ${C_ANSI} dummy.c && {
 	CC=$compiler;
-	test -z "${CCOMPILER:-}" && CCOMPILER=`findApp $compiler $PATH`
-	test -z "${ENVOPTS:-}"   && ENVOPTS="${C_ANSI:-}"
+	test -z "${CCOMPILER-}" && CCOMPILER=`findApp $compiler $PATH`
+	test -z "${ENVOPTS-}"   && ENVOPTS="${C_ANSI-}"
 	return 0
     }
     return 1
@@ -506,7 +517,7 @@ checkCompiler()
 
 CCtested=
 capture cat dummy.c
-if [ -z "${CC:-}" ]; then
+if [ -z "${CC-}" ]; then
     CCOMPILER=
     for i in gcc cc ncc dcc xlc c89 gcc2; do
 	CCtested="$CCtested $i"
@@ -550,7 +561,7 @@ this script.
 EOF
     boom
 fi
-Note "Using $CCOMPILER for a C compiler (set CC to override)."
+Note "Using $CCOMPILER for a C compiler (use -with-CC=compilername to override)."
 
 test "$ENVOPTS" && {
     Note "Using $ENVOPTS to get the appropriate compilation environment."
@@ -571,7 +582,7 @@ CheckForGandO()
     return 0
 }
 
-if [ -z "${GCOPTS:-}" ]; then
+if [ -z "${GCOPTS-}" ]; then
     if capture $CCOMPILER $ENVOPTS -g -c dummy.c; then
 	Note "Looks like $CCOMPILER supports the -g option."
 	# NB: cannot use captureX here 'cuz we lose stderr
@@ -637,13 +648,13 @@ EOF
     fi
 fi
 
-test -z "${AR:-}" && AR=`findApp ar $PATH`
+test -z "${AR-}" && AR=`findApp ar $PATH`
 if [ -z "$AR" ]; then
     Note "*** Warning, could not locate a suitable ar command; using a default."
     AR=ar
 fi
-test -z "${AROPTS:-}" && AROPTS=rc
-test -z "${RANLIB:-}" && RANLIB=`findApp ranlib $PATH`
+test -z "${AROPTS-}" && AROPTS=rc
+test -z "${RANLIB-}" && RANLIB=`findApp ranlib $PATH`
 if [ -z "$RANLIB" ]; then
     Note "Warning, no ranlib, assuming it's not needed."
     RANLIB=":"
@@ -990,7 +1001,7 @@ BuildPortDotH()
     echo 'typedef double dblparam_t;'
 	Note "... using double for promoted floating point parameters"
 
-    if [ -z "${INLINE:-}" ]; then
+    if [ -z "${INLINE-}" ]; then
 	if [ $ISGCC = yes ]; then
 	    echo '#ifdef __STRICT_ANSI__'
 	    echo '#define	INLINE	__inline__'
@@ -1049,10 +1060,10 @@ if [ "$PORT" = auto ]; then
     for i in $FUNCS; do
         CheckForFunc $i || {
             Note "... emulate $i"
-            PORTFUNCS="${PORTFUNCS:-} $i.c"
+            PORTFUNCS="${PORTFUNCS-} $i.c"
         }
     done
-    if [ "${PORTFUNCS:-}" ]; then
+    if [ "${PORTFUNCS-}" ]; then
         LIBPORT='../port/libport.a'
         PORT=yes
     else
@@ -1069,7 +1080,7 @@ Note ""
 Note "Checking for Dynamic Shared Object (DSO) support."
 if [ "$DSO" = auto ]; then
     DSOSUF_VERSION=
-    case $TARGET-$CC in
+    case $TARGET-$CC-$ISGCC in
     *-irix5.2*)
 	if (findApp rld /lib:/usr/lib:$PATH) >/dev/null 2>&1; then
 	    DSOSUF=so
@@ -1101,6 +1112,13 @@ if [ "$DSO" = auto ]; then
 #	LIBPORT="-Wl,+b${DIR_LIB}"
 	DSO=HPUX
 	;;
+    *-solaris*-yes)
+	DSOSUF=so
+	DSOLD='${LD}'
+	DSOOPTS='-G'
+	LIBCOPTS="-fpic"
+	DSO=SOLARIS
+	;;
     *-solaris*)
 	DSOSUF=so
 	DSOLD='${LD}'
@@ -1179,16 +1197,16 @@ Note "Selecting programs used during installation."
 #
 # Miscellaneous ``little'' programs.
 #
-test -z "${CHMOD:-}"	&& CHMOD=`findAppDef chmod $PATH chmod`
-test -z "${LN:-}"	&& LN=`findAppDef ln $PATH ln`
-test -z "${SCRIPT_SH:-}" && SCRIPT_SH=`findAppDef sh $PATH sh`
-test -z "${SED:-}"	&& SED=`findAppDef sed $PATH sed`
-test -z "${STRIP:-}"	&& STRIP=`findAppDef strip $PATH strip`
+test -z "${CHMOD-}"	&& CHMOD=`findAppDef chmod $PATH chmod`
+test -z "${LN-}"	&& LN=`findAppDef ln $PATH ln`
+test -z "${SCRIPT_SH-}" && SCRIPT_SH=`findAppDef sh $PATH sh`
+test -z "${SED-}"	&& SED=`findAppDef sed $PATH sed`
+test -z "${STRIP-}"	&& STRIP=`findAppDef strip $PATH strip`
 
 #
 # Check if mv -f is supported
 #
-if [ -z "${MV_F:-}" ]; then
+if [ -z "${MV_F-}" ]; then
     $RM t.c; echo "">t.c
     if mv -f t.c t.o; then
 	Note "Looks like mv supports the -f option to force a move."
@@ -1203,7 +1221,7 @@ fi
 #
 # Check if ln -s creates a symbolic link.
 #
-if [ -z "${LN_S:-}" ]; then
+if [ -z "${LN_S-}" ]; then
     $RM t.c; $LN -s foo t.c && LN_S=-s
 fi
 if [ -n "$LN_S" ]; then
@@ -1216,7 +1234,7 @@ fi
 #
 # Pick install mechanism.
 #
-if [ -z "${INSTALL:-}" ]; then
+if [ -z "${INSTALL-}" ]; then
     case $TARGET in
     *-irix*)	INSTALL=`findApp install /sbin:$PATH`;;
     *)		INSTALL='${SHELL} ../port/install.sh';;
@@ -1258,7 +1276,7 @@ bitchExecutable()
 # 4. Whether or not the FlexFAX ``F'' suffix must be
 #    stripped for pages to be found (only for 4F pages).
 #
-if [ -z "${DIR_MAN:-}" ]; then
+if [ -z "${DIR_MAN-}" ]; then
     MANPATH="
 	$MANPATH
 	/usr/local/man
@@ -1272,7 +1290,7 @@ if [ -z "${DIR_MAN:-}" ]; then
     test -z "$DIR_MAN" && DIR_MAN=/usr/local/man
 fi
 Note "Looks like manual pages go in $DIR_MAN."
-if [ -z "${MANSCHEME:-}" ]; then
+if [ -z "${MANSCHEME-}" ]; then
     case $TARGET in
     *-bsdi*|*-netbsd*)		MANSCHEME=bsd-nroff-gzip-0.gz;;
     *-freebsd*)			MANSCHEME=bsd-source-cat;;
@@ -1336,7 +1354,7 @@ fi
 promptForNonNullStringParameter()
 {
     x="" val="$1" desc="$2"
-    while [ -z "${x:-}" ]; do
+    while [ -z "$x" ]; do
 	prompt "$desc [$val]?"; read x
 	if [ "$x" ]; then
 	    # strip leading and trailing white space
@@ -1351,7 +1369,7 @@ promptForNonNullStringParameter()
 promptForManPageScheme()
 {
     x=""
-    while [ -z "${x:-}" ]; do
+    while [ -z "$x" ]; do
 	prompt "Manual page installation scheme [$MANSCHEME]?"; read x
 	if [ "$x" ]; then
 	    # strip leading and trailing white space
@@ -1461,10 +1479,11 @@ Either fix the pathname or disable the JPEG support.
 
 EOF
 	}
-        test -d "${DIR_JPEGLIB}" || {
-            cat<<EOF
+        test $SRCDIR_IS_LIBTIFF = yes || \
+	  test -d "${DIR_JPEGLIB:-/dev/null/no-such-file}" || {
+	    cat<<EOF
 
-The JPEG library directory, ${DIR_JPEGLIB}, does not seem to exist.
+The JPEG library directory, "${DIR_JPEGLIB}", does not seem to exist.
 This must be corrected if the JPEG support is to be enabled.
 Either fix the pathname or disable the JPEG support.
 
@@ -1489,11 +1508,12 @@ Either fix the pathname or disable the (G)ZIP support.
 
 EOF
         }
-        test -d "${DIR_GZLIB}" || {
-            cat<<EOF
+        test $SRCDIR_IS_LIBTIFF = yes \
+          || test -d "${DIR_GZLIB:-/dev/null/no-such-file}" || {
+	    cat<<EOF
 
-The libgz source directory, ${DIR_GZLIB}, does not seem to be setup
-correctly.  This must be corrected if the ZIP support is to be enabled.
+The libgz library directory, "${DIR_GZLIB}", does not seem to exist.
+This must be corrected if the ZIP support is to be enabled.
 Either fix the pathname or disable the ZIP support.
 
 EOF
@@ -1562,15 +1582,21 @@ case $MANSCHEME in
 esac
 
 if [ "${JPEG}" = yes ]; then
-    test -z "${CONF_JPEG:-}"	&& CONF_JPEG="-DJPEG_SUPPORT"
-    test -z "${LIBJPEG:-}"	&& LIBJPEG="-L${DIR_JPEGLIB} -ljpeg"
+    test -z "${CONF_JPEG-}"	&& CONF_JPEG="-DJPEG_SUPPORT"
+    if test -z "${LIBJPEG-}" ; then
+      LIBJPEG="-ljpeg"
+      test -z "${DIR_JPEGLIB-}" || LIBJPEG="-L${DIR_JPEGLIB} ${LIBJPEG}"
+    fi
 else
     CONF_JPEG=
     LIBJPEG=
 fi
 if [ "${ZIP}" = yes ]; then
-    test -z "${CONF_ZIP:-}"	&& CONF_ZIP="-DZIP_SUPPORT"
-    test -z "${LIBGZ:-}"	&& LIBGZ="-L${DIR_GZLIB} -lz"
+    test -z "${CONF_ZIP-}"	&& CONF_ZIP="-DZIP_SUPPORT"
+    if test -z "${LIBGZ-}" ; then
+      LIBGZ="-lz"
+      test -z "${DIR_GZLIB-}" || LIBGZ="-L${DIR_GZLIB} ${LIBGZ}"
+    fi
 else
     CONF_ZIP=
     LIBGZ=
@@ -1593,8 +1619,10 @@ relativize()
 	(for i do
 	    case "$i" in
 	    /*|-l*)	echo "$i" ;;
-	    -L|-L/*)	echo "$i" ;;
-	    -L*)	echo "$i" | sed 's;-L;-L../;' ;;
+	    -[LR])	;;				# XXX???
+	    -[LR]/*)	echo "$i" ;;
+	    -L*)	echo "$i" | sed 's;^-L;-L../;' ;;
+	    -R*)	echo "$i" | sed 's;^-R;-R../;' ;;
 	    *)		echo "../$i" ;;
 	    esac
 	done) | tr '\012' ' '
diff --git a/libtiff/Makefile.acorn b/contrib/acorn/Makefile
old mode 100755
new mode 100644
similarity index 73%
rename from libtiff/Makefile.acorn
rename to contrib/acorn/Makefile
index 6c0d46b6..8f014778
--- a/libtiff/Makefile.acorn
+++ b/contrib/acorn/Makefile
@@ -13,25 +13,78 @@ Squeezeflags = -o $@
 
 
 # Final targets:
-@.o.LIBTIFF:   @.o.tif_acorn @.o.tif_aux @.o.tif_close @.o.tif_codec \
-	@.o.tif_compress @.o.tif_dir @.o.tif_dirinfo @.o.tif_dirread @.o.tif_dirwrite @.o.tif_dumpmode \
-	@.o.tif_error @.o.tif_fax3 @.o.tif_flush @.o.tif_getimage @.o.tif_jpeg @.o.tif_lzw \
-	@.o.tif_next @.o.tif_open @.o.tif_packbits @.o.tif_predict @.o.tif_print @.o.tif_read \
-	@.o.tif_strip @.o.tif_swab @.o.tif_thunder @.o.tif_tile @.o.tif_version @.o.tif_warning \
-	@.o.tif_write @.o.tif_zip @.o.tif_fax3sm @.h.version 
-	LibFile $(LibFileflags) @.o.tif_acorn @.o.tif_aux @.o.tif_close \
-	@.o.tif_codec @.o.tif_compress @.o.tif_dir @.o.tif_dirinfo @.o.tif_dirread @.o.tif_dirwrite \
-	@.o.tif_dumpmode @.o.tif_error @.o.tif_fax3 @.o.tif_flush @.o.tif_getimage @.o.tif_jpeg \
-	@.o.tif_lzw @.o.tif_next @.o.tif_open @.o.tif_packbits @.o.tif_predict @.o.tif_print \
-	@.o.tif_read @.o.tif_strip @.o.tif_swab @.o.tif_thunder @.o.tif_tile @.o.tif_version \
-	@.o.tif_warning @.o.tif_write @.o.tif_zip @.o.tif_fax3sm 
+@.o.LIBTIFF:   \
+        @.o.tif_acorn \
+        @.o.tif_aux \
+        @.o.tif_close \
+        @.o.tif_codec \
+	@.o.tif_compress \
+	@.o.tif_dir \
+	@.o.tif_dirinfo \
+	@.o.tif_dirread \
+	@.o.tif_dirwrite \
+	@.o.tif_dumpmode \
+	@.o.tif_error \
+	@.o.tif_fax3 \
+	@.o.tif_flush \
+	@.o.tif_getimage \
+	@.o.tif_jpeg \
+	@.o.tif_lzw \
+	@.o.tif_next \
+	@.o.tif_open \
+	@.o.tif_packbits \
+	@.o.tif_predict \
+	@.o.tif_print \
+	@.o.tif_read \
+	@.o.tif_strip \
+	@.o.tif_swab \
+	@.o.tif_thunder \
+	@.o.tif_tile \
+	@.o.tif_version \
+	@.o.tif_warning \
+	@.o.tif_write \
+	@.o.tif_zip \
+	@.o.tif_fax3sm \
+	@.h.version 
+	LibFile $(LibFileflags) \
+	@.o.tif_acorn \
+	@.o.tif_aux \
+	@.o.tif_close \
+	@.o.tif_codec \
+	@.o.tif_compress \
+	@.o.tif_dir \
+	@.o.tif_dirinfo \
+	@.o.tif_dirread \
+	@.o.tif_dirwrite \
+	@.o.tif_dumpmode \
+	@.o.tif_error \
+	@.o.tif_fax3 \
+	@.o.tif_flush \
+	@.o.tif_getimage \
+	@.o.tif_jpeg \
+	@.o.tif_lzw \
+	@.o.tif_next \
+	@.o.tif_open \
+	@.o.tif_packbits \
+	@.o.tif_predict \
+	@.o.tif_print \
+	@.o.tif_read \
+	@.o.tif_strip \
+	@.o.tif_swab \
+	@.o.tif_thunder \
+	@.o.tif_tile \
+	@.o.tif_version \
+	@.o.tif_warning \
+	@.o.tif_write \
+	@.o.tif_zip \
+	@.o.tif_fax3sm 
 
 
 # User-editable dependencies:
 @.mkversion:   @.o.mkversion C:o.Stubs 
 	Link $(linkflags) @.o.mkversion C:o.Stubs 
 @.h.version:   @.VERSION @.mkversion 
-	<Prefix$Dir>.mkversion @.VERSION @.h.version 
+	<Prefix$Dir>.mkversion -v @.VERSION -a @.tiff/alpha @.h.version 
 @.mkg3states:   @.o.mkg3states @.o.getopt C:o.Stubs 
 	link $(linkflags) @.o.mkg3states C:o.Stubs @.o.getopt 
 @.c.tif_fax3sm:   @.mkg3states 
diff --git a/contrib/acorn/ReadMe b/contrib/acorn/ReadMe
old mode 100755
new mode 100644
diff --git a/contrib/acorn/cleanlib b/contrib/acorn/cleanlib
new file mode 100755
index 00000000..78a2d034
--- /dev/null
+++ b/contrib/acorn/cleanlib
@@ -0,0 +1,5 @@
+IfThere LibTIFF:o.* THEN Wipe LibTIFF:o.* ~CFR~V
+IfThere LibTIFF:c.tif_fax3sm THEN Delete LibTIFF:c.tif_fax3sm
+IfThere LibTIFF:mkg3states THEN Delete LibTIFF:mkg3states
+IfThere LibTIFF:h.version THEN Delete LibTIFF:h.version
+IfThere LibTIFF:mkversion THEN Delete LibTIFF:mkversion
diff --git a/contrib/acorn/convert b/contrib/acorn/convert
old mode 100755
new mode 100644
diff --git a/contrib/acorn/install b/contrib/acorn/install
index fd0f3919..fa49d1ba 100755
--- a/contrib/acorn/install
+++ b/contrib/acorn/install
@@ -2,7 +2,7 @@ If "%0" = "" Then Error Syntax: install |<source_dir> |<dest_dir>
 If "%1" = "" Then Error Syntax: install |<source_dir> |<dest_dir>
 Set LibTiffInstall$Dir %0
 Set LibTiff$Dir %1
-Set Alias$CPY Copy <LibTiffInstall$Dir>.%%0 <LibTiff$Dir>.%%1 ~C~DF~NQRV
+Set Alias$CPY Copy <LibTiffInstall$Dir>.%%0 <LibTiff$Dir>.%%1 ~C~DF~NRV
 CDir <LibTiff$Dir>
 CDir <LibTiff$Dir>.c
 CDir <LibTiff$Dir>.h
@@ -10,9 +10,11 @@ CDir <LibTiff$Dir>.o
 CPY COPYRIGHT			COPYRIGHT
 CPY README			README
 CPY VERSION			VERSION
+CPY dist.tiff/alpha             tiff/alpha
 CPY contrib.acorn.SetVars	SetVars
+CPY contrib.acorn.Makefile	Makefile
+CPY contrib.acorn.cleanlib      cleanlib
 CPY port.getopt/c		c.getopt
-CPY libtiff.Makefile/acorn	Makefile
 CPY libtiff.mkg3states/c	c.mkg3states
 CPY libtiff.mkspans/c		c.mkspans
 CPY libtiff.mkversion/c		c.mkversion
@@ -58,8 +60,10 @@ CPY libtiff.tif_predict/h	h.tif_predic
 SetType <LibTiff$Dir>.COPYRIGHT		Text
 SetType <LibTiff$Dir>.README		Text
 SetType <LibTiff$Dir>.VERSION		Text
+SetType <LibTiff$Dir>.tiff/alpha        Text
 SetType <LibTiff$Dir>.SetVars		Obey
 SetType <LibTiff$Dir>.Makefile		fe1
+SetType <LibTiff$Dir>.cleanlib          Obey
 SetType <LibTiff$Dir>.c.getopt		Text
 SetType <LibTiff$Dir>.c.mkg3states	Text
 SetType <LibTiff$Dir>.c.mkspans		Text
diff --git a/dist/tiff.alpha b/dist/tiff.alpha
index c04be6b3..dff34ff5 100644
--- a/dist/tiff.alpha
+++ b/dist/tiff.alpha
@@ -1 +1 @@
-define ALPHA 031
+define ALPHA 032
diff --git a/html/Makefile.in b/html/Makefile.in
index 90d48c57..62120ae7 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -1,4 +1,4 @@
-#	$Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.8 1996/02/09 21:28:38 sam Exp $
+#	$Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.9 1996/04/09 17:37:07 sam Exp $
 #
 # @WARNING@
 #
@@ -67,6 +67,8 @@ HTMLFILES=\
 	v3.4beta024.html	\
 	v3.4beta028.html	\
 	v3.4beta029.html	\
+	v3.4beta031.html	\
+	v3.4beta032.html	\
 	${NULL}
 IMAGES=\
 	images/back.gif		\
diff --git a/html/build.html b/html/build.html
index 6cefc72a..97bb1f49 100644
--- a/html/build.html
+++ b/html/build.html
@@ -652,7 +652,8 @@ <H5>
 <I>
 There is a Makefile for Microsoft C.
 There is OS support for MS-DOS and for Windows.
-Someone needs to fill this in....
+Someone needs to fill this in, but no DOS-weenies seem to
+give a damn so this section is blank for now ....
 </I>
 
 
@@ -956,10 +957,10 @@ <H3>Compiling LibTIFF:</H3>
 directory.
 
 <P>
-The library requires two files that are generated by <I>on-the-fly</I>.
+The library requires two files that are generated <I>on-the-fly</I>.
 The file <B>tif_fax3sm.c</B> has the state tables for the
 Group 3 and Group 4 decoders.
-This file is normally generated by the <TT>mkg3states</TT> program
+This file is generated by the <TT>mkg3states</TT> program
 on a UNIX system; for example,
 
 <UL><PRE><TT>
@@ -983,7 +984,7 @@ <H3>Compiling LibTIFF:</H3>
 The second file required to build the library, <B>version.h</B>,
 contains the version
 information returned by the <TT>TIFFGetVersion</TT> routine.
-This file is built on most system using the
+This file is built on most systems using the
 <TT>mkversion</TT> program and the contents of the
 <TT>VERSION</TT> and <TT>tiff.alpha</TT> files; for example,
 
@@ -1079,6 +1080,7 @@ <H3>Compiling LibTIFF:</H3>
 libtiff/tif_next.c		NeXT 2-bit scheme codec (decoding only)
 libtiff/tif_open.c		open and simply query code
 libtiff/tif_packbits.c		Packbits codec
+libtiff/tif_pixarlog.c		Pixar codec
 libtiff/tif_predict.c		Predictor tag support
 libtiff/tif_print.c		directory printing support
 libtiff/tif_read.c		image data reading support
@@ -1105,7 +1107,7 @@ <H3>Compiling LibTIFF:</H3>
 
 <ADDRESS>
 <A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>.
-Last updated: $Date: 1996/03/18 22:21:04 $
+Last updated: $Date: 1996/04/09 16:53:39 $
 </ADDRESS>
 
 </BODY>
diff --git a/html/index.html b/html/index.html
index c35ddf6c..86168654 100644
--- a/html/index.html
+++ b/html/index.html
@@ -12,7 +12,7 @@ <H1>
 </H1>
 
 <B>Latest Release</B>: <I>None</I><BR>
-<B>Latest Software</B>: <A HREF="v3.4beta031.html">v3.4beta031</A><BR>
+<B>Latest Software</B>: <A HREF="v3.4beta032.html">v3.4beta032</A><BR>
 <B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
 <B>Home Page</B>: <A HREF="http://www-mipl.jpl.nasa.gov/~ndr/tiff/">
   http://www-mipl.jpl.nasa.gov/~ndr/tiff/</A> <BR>
@@ -81,7 +81,7 @@ <H5>
 
 <ADDRESS>
 <A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>.
-Last updated: $Date: 1996/03/18 22:21:19 $
+Last updated: $Date: 1996/04/09 17:37:07 $
 </ADDRESS>
 
 </BODY>
diff --git a/html/internals.html b/html/internals.html
index 5c806c02..bfb9d7f2 100644
--- a/html/internals.html
+++ b/html/internals.html
@@ -104,7 +104,7 @@ <H5>
 Experimental support for the deflate algorithm is controlled by
 <TT>DEFLATE_SUPPORT</TT>.
 The deflate codec that comes with <TT>libtiff</TT> is designed
-for use with version 0.92 or later of the freely available
+for use with version 0.99 or later of the freely available
 <TT>libz</TT> library written by Jean-loup Gailly and Mark Adler.
 The data format used by this library is described
 in the files
@@ -179,6 +179,11 @@ <H5>
 <TD>experimental Deflate scheme (compression 32946)</TD>
 </TR>
 
+<TR>
+<TD VALIGN=top><TT>PIXARLOG_SUPPORT</TT></TD>
+<TD>Pixar's compression scheme for high-resolution color images (compression 32909)</TD>
+</TR>
+
 <TR>
 <TD VALIGN=top><TT>COLORIMETRY_SUPPORT</TT></TD>
 <TD>support for the TIFF 6.0 colorimetry tags</TD>
@@ -276,7 +281,8 @@ <H5>
 
 <TR>
 <TD VALIGN=top><TT>HAVE_MMAP</TT></TD>
-<TD>Define this if there is support for memory mapping files.</TD>
+<TD>Define this if there is <I>mmap-style</I> support for
+mapping files into memory (used only to read data).</TD>
 </TR>
 
 <TR>
@@ -633,7 +639,7 @@ <H5>
 
 <ADDRESS>
 <A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>.
-Last updated: $Date: 1995/10/16 21:56:24 $
+Last updated: $Date: 1996/04/09 16:53:39 $
 </ADDRESS>
 
 </BODY>
diff --git a/html/libtiff.html b/html/libtiff.html
index 3625dc0f..811a4d58 100644
--- a/html/libtiff.html
+++ b/html/libtiff.html
@@ -96,6 +96,9 @@ <H5>
 Within an application that uses <TT>libtiff</TT> the <TT>TIFFGetVersion</TT>
 routine will return a pointer to a string that contains software version
 information.
+The library include file <TT>&lt;tiffio.h&gt;</TT> contains a C pre-processor
+define <TT>TIFFLIB_VERSION</TT> that can be used to check library
+version compatiblity at compile time.
 
 <A NAME="Typedefs"><P><HR WIDTH=65% ALIGN=right><H3>Library Datatypes</H3></A>
 
@@ -735,7 +738,7 @@ <H5>
 
 <ADDRESS>
 <A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>.
-Last updated: $Date: 1995/10/16 21:46:15 $
+Last updated: $Date: 1996/04/09 16:53:39 $
 </ADDRESS>
 
 </BODY>
diff --git a/html/misc.html b/html/misc.html
index d9fd7c1b..ff2c0468 100644
--- a/html/misc.html
+++ b/html/misc.html
@@ -69,8 +69,8 @@ <H2>Use and Copyright</H2>
 also be interested in knowing about it and, hopefully, be acknowledged.
 
 <P><H5><PRE>
-Copyright (c) 1988-1995 Sam Leffler
-Copyright (c) 1991-1995 Silicon Graphics, Inc.
+Copyright (c) 1988-1996 Sam Leffler
+Copyright (c) 1991-1996 Silicon Graphics, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and 
 its documentation for any purpose is hereby granted without fee, provided
@@ -97,7 +97,7 @@ <H2>Use and Copyright</H2>
 
 <ADDRESS>
 <A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>.
-Last updated: $Date: 1995/06/28 23:57:28 $
+Last updated: $Date: 1996/04/09 16:53:39 $
 </ADDRESS>
 
 </BODY>
diff --git a/html/support.html b/html/support.html
index 6480ad7f..87210d81 100644
--- a/html/support.html
+++ b/html/support.html
@@ -178,6 +178,7 @@ <H5>
 <PRE>
     Compression = 32766	NeXT 2-bit encoding
     Compression = 32809	ThunderScan 4-bit encoding
+    Compression = 32909	Pixar companded 11-bit ZIP encoding
     Compression = 34999	PKZIP-style Deflate encoding (experimental)
 </PRE>
 
@@ -664,7 +665,7 @@ <H5>
 
 <ADDRESS>
 <A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>.
-Last updated: $Date: 1995/06/30 23:28:32 $
+Last updated: $Date: 1996/04/09 16:53:39 $
 </ADDRESS>
 
 </BODY>
diff --git a/html/v3.4beta032.html b/html/v3.4beta032.html
new file mode 100644
index 00000000..f19604c2
--- /dev/null
+++ b/html/v3.4beta032.html
@@ -0,0 +1,89 @@
+<HTML>
+<HEAD>
+<TITLE>
+Changes in TIFF v3.4beta032
+</TITLE>
+</HEAD>
+
+<BODY>
+
+<BASEFONT SIZE=4>
+<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
+<BASEFONT SIZE=3>
+
+<UL>
+<HR SIZE=4 WIDTH=65% ALIGN=left>
+<B>Current Version</B>: v3.4beta032<BR>
+<B>Previous Version</B>: <A HREF=v3.4beta031.html>v3.4beta031</A><BR>
+<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
+<HR SIZE=4 WIDTH=65% ALIGN=left>
+</UL>
+
+<P>
+This document describes the changes made to the software between the
+<I>previous</I> and <I>current</I> versions (see above).
+If you don't find something listed here, then it was not done in this
+timeframe, or it was not considered important enough to be mentioned.
+The following information is located here:
+<UL>
+<LI><A HREF="#configure">Changes in the software configuration</A>
+<LI><A HREF="#libtiff">Changes in libtiff</A>
+<LI><A HREF="#tools">Changes in the tools</A>
+<LI><A HREF="#contrib">Changes in the contributed software</A>
+</UL>
+
+<P><HR WIDTH=65% ALIGN=right>
+
+<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
+
+<UL>
+<LI>various fixups and subtle improvements to <B>configure</B>
+    from Richard Mlynarik
+</UL>
+
+<P><HR WIDTH=65% ALIGN=right>
+
+<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
+
+<UL>
+<LI>a new codec from Pixar designed for high-resolution color images;
+    note that this codec is not configured by default
+<LI>a bug fix for reading tags with a single <TT>FLOAT</TT> value
+<LI>change to the <TT>TIFFGetField</TT> calling convention:
+    a tag that has a single value of
+    type <TT>DOUBLE</TT> is now retrieved by passing a
+    ``<TT>double*</TT>'' instead of a
+    ``<TT>double**</TT>'' (this change makes the handling of tags with
+    <TT>DOUBLE</TT> values identical to the handling of tags with
+    <TT>FLOAT</TT> values)
+<LI>fix to VMS support for the handling of floating point values
+</UL>
+
+<P><HR WIDTH=65% ALIGN=right>
+
+<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
+
+<UL>
+<LI><B>tiffdump</B> now handles tags with <TT>FLOAT</TT> and <TT>DOUBLE</TT>
+    values
+</UL>
+
+<P><HR WIDTH=65% ALIGN=right>
+
+<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIBUTED SOFTWARE:</B></A>
+
+<UL>
+<LI>updates to the Acorn OS support from Peter Greenham
+</UL>
+
+<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
+
+<HR>
+
+<ADDRESS>
+<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
+Last updated $Date: 1996/04/09 17:37:03 $.
+</ADDRESS>
+
+</BODY>
+</HTML>
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
index f7d0c488..2ea2c325 100644
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@@ -1,4 +1,4 @@
-#	$Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.32 1996/03/14 00:54:03 sam Exp $
+#	$Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.33 1996/04/05 17:36:53 sam Exp

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