From 963e9c6bc0b30048052bf076e0c8b62ea2f9e90f Mon Sep 17 00:00:00 2001
From: Sam Leffler <[EMAIL REDACTED]>
Date: Fri, 9 Feb 1996 22:51:07 +0000
Subject: [PATCH] v3.4beta029 release
---
Makefile.in | 11 ++-
TODO | 5 +-
config.site | 53 +++++++++--
configure | 16 ++--
contrib/mac-cw/Makefile.script | 72 ++++++++++++++
contrib/mac-cw/README | 18 ++++
contrib/mac-cw/mac_main.c | 20 ++++
contrib/mac-cw/mac_main.h | 12 +++
contrib/mac-cw/metrowerks.note | 84 +++++++++++++++++
contrib/mac-cw/mkg3_main.c | 14 +++
contrib/mac-cw/version.h | 4 +
contrib/vms/libtiff/tiffshraxp.opt | Bin 3221 -> 3221 bytes
dist/tiff.alpha | 2 +-
html/Makefile.in | 6 +-
html/build.html | 63 +++++++++++--
html/index.html | 4 +-
html/v3.4beta028.html | 145 +++++++++++++++++++++++++++++
html/v3.4beta029.html | 85 +++++++++++++++++
libtiff/Makefile.in | 8 +-
libtiff/tif_apple.c | 4 +-
libtiff/tif_fax3.c | 101 +++++++++++---------
libtiff/tif_fax3.h | 42 +++++++--
libtiff/tiffcomp.h | 4 +-
man/Makefile.in | 4 +-
port/Makefile.in | 4 +-
tools/Makefile.in | 12 ++-
26 files changed, 691 insertions(+), 102 deletions(-)
create mode 100644 contrib/mac-cw/Makefile.script
create mode 100644 contrib/mac-cw/README
create mode 100644 contrib/mac-cw/mac_main.c
create mode 100644 contrib/mac-cw/mac_main.h
create mode 100644 contrib/mac-cw/metrowerks.note
create mode 100644 contrib/mac-cw/mkg3_main.c
create mode 100644 contrib/mac-cw/version.h
create mode 100644 html/v3.4beta028.html
create mode 100644 html/v3.4beta029.html
diff --git a/Makefile.in b/Makefile.in
index 14c79064..d9d15abf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
#! smake
-# $Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.41 1996/01/10 19:30:44 sam Exp $
+# $Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.44 1996/02/09 21:29:19 sam Exp $
#
# @WARNING@
#
@@ -38,7 +38,7 @@ SRCDIR = @SRCDIR@
# CXXCOMPILER: @CXXCOMPILER@
#
@SETMAKE@
-SHELL = /bin/sh
+SHELL = @SCRIPT_SH@
NULL =
ECHO = echo
GENDIST = ${TOOLROOT}/usr/sbin/gendist
@@ -46,6 +46,8 @@ GENDIST = ${TOOLROOT}/usr/sbin/gendist
all default:
@if [ "@PORT@" = yes ]; then \
${ECHO} "= "port; cd port; ${MAKE}; \
+ else \
+ true; \
fi
@${ECHO} "= "libtiff; cd libtiff; ${MAKE}
@${ECHO} "= "tools; cd tools; ${MAKE}
@@ -59,6 +61,8 @@ install:
clean:
@if [ "@PORT@" = yes ]; then \
${ECHO} "= "port; cd port; ${MAKE} clean; \
+ else \
+ true; \
fi
@${ECHO} "= "libtiff; cd libtiff; ${MAKE} clean
@${ECHO} "= "tools; cd tools; ${MAKE} clean
@@ -256,6 +260,8 @@ TIFFFILES=\
html/misc.html \
html/support.html \
html/tools.html \
+ html/v3.4beta029.html \
+ html/v3.4beta028.html \
html/v3.4beta024.html \
html/v3.4beta018.html \
html/v3.4beta016.html \
@@ -305,6 +311,7 @@ CONTRIBFILES=\
contrib/win32 \
contrib/win95 \
contrib/winnt \
+ contrib/mac-cw \
${NULL}
DISTFILES=\
${TIFFFILES} \
diff --git a/TODO b/TODO
index 1b6beea0..3fd94828 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,7 @@
-# $Header: /usr/people/sam/tiff/RCS/TODO,v 1.2 1995/07/03 18:42:38 sam Exp $
+# $Header: /usr/people/sam/tiff/RCS/TODO,v 1.4 1996/02/09 22:09:00 sam Exp $
-o update manual pages
o tiffcmp read data by strip/tile instead of scanline
o YCbCr sampling support
-o html manual pages
o extracate colorspace conversion support
o look at isolating all codecs from TIFF library
-o tiffcp problem with JPEG-encoded image
o JPEG colormode order dependency problem
diff --git a/config.site b/config.site
index 54a1b746..357294c3 100644
--- a/config.site
+++ b/config.site
@@ -1,4 +1,4 @@
-# $Header: /usr/people/sam/tiff/RCS/config.site,v 1.8 1996/01/10 19:31:37 sam Exp $
+# $Header: /usr/people/sam/tiff/RCS/config.site,v 1.10 1996/02/09 05:53:45 sam Exp $
#
# TIFF Software
#
@@ -41,8 +41,8 @@
# Package controls.
#
#DSO="auto" # auto|IRIX configure DSO support for system
-#JPEG="no" # yes|no configure JPEG support
-#ZIP="no" # yes|no configure Deflate support
+#JPEG="no" # yes|no configure JPEG support (see below)
+#ZIP="no" # yes|no configure Deflate support (see below)
#LIBGL="auto" # yes|no|auto configure IRIS GL-based tools
#LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools
@@ -55,16 +55,48 @@
#DIR_MAN="/usr/local/man" # directory for manual pages
#
-# JPEG-specific parameters; used when JPEG support is enabled.
+# Configuring supporting libraries.
#
-# NB: JPEG support requires release 5 or later of the IJG code,
-# which you can find on the Internet at ftp.uu.net:/graphics/jpeg/.
+# The TIFF software makes use of two ancillary packages: the IJG
+# distribution to support the JPEG codec and the zlib distribution
+# to support the Deflate codec. To setup use of these packages you
+# need to specify where each package's include files are located and
+# where the pre-built library (static archive or DSO) is located.
+# These may be different or the same (as when the package is compiled
+# and referenced directly from the place where the software was
+# loaded and compiled).
#
-#DIRS_LIBINC="$DIRS_LIBINC ../jpeg" # directory for JPEG include files
-#LIBJPEG="-L ../jpeg -ljpeg" # JPEG library to load
+# DIRS_LIBINC is a space-separated list of directories to use for
+# locating include files in these packages. Note that it should not
+# include -I options as might be passed to the C preprocessor; these
+# are automatically added by the configure script when the Makefiles
+# are generated.
+#
+# DIR_<package>LIB is the pathname of the directory where <package>'s
+# pre-built library may be found; this is used when building a TIFF
+# DSO (on systems where support is present) and when building the
+# programs in the tools directory. By default the configure script
+# will load the associated library using
+#
+# -L${DIR_<package>LIB} -l<package>
+#
+# e.g. -L${DIR_JPEGLIB} -ljpeg. If this is wrong for your system
+# (e.g. your compiler/loader does not support the -L option), then
+# the LIB<package> parameter can be set explicitly to specify the
+# library to use.
+#
+
+#
+# JPEG-specific parameters; used when JPEG support is enabled (see above).
+#
+# 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
#
-# Deflate-specific parameters; used when Deflate support is enabled.
+# Deflate-specific parameters; used when Deflate support is enabled (see above).
#
# NB: Deflate support requires version 0.92 or later of the zlib
# library written by Jean-loup Gailly and Mark Adler. Starting
@@ -76,7 +108,7 @@
# Look for it also at ftp://ftp.uu.net/pub/archiving/zip/zlib.
#
#DIRS_LIBINC="$DIRS_LIBINC ../zlib" # directory for zlib include files
-#LIBGZ="-L ../zlib -lz" # libgz library to load
+#DIR_GZLIB="../zlib" # directory for libz
#
# Miscellaneous parameters.
@@ -129,4 +161,5 @@
#LN_S="-s" # option to ${LN} to create symlink
#MV_F="-f" # option to ${MV} to force operation
#SED="/bin/sed" # pathname of suitable sed program
+#SCRIPT_SH="/bin/sh" # pathname of suitable shell
#STRIP="/bin/strip" # strip program used by install.sh
diff --git a/configure b/configure
index b68f57b6..9613382d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Header: /usr/people/sam/tiff/RCS/configure,v 1.32 1996/01/10 19:31:39 sam Exp $
+# $Header: /usr/people/sam/tiff/RCS/configure,v 1.34 1996/02/09 05:53:45 sam Exp $
#
# Tag Image File Format (TIFF) Software
#
@@ -52,7 +52,7 @@ MACHDEPLIBS=-lm
: ${MAKE=make} # make to use
# screws up the test of `-f -'
-unset MAKEFLAGS
+: ${MAKEFLAGS=} # unset MAKEFLAGS
RM="rm -f"
POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
@@ -140,7 +140,7 @@ do
-target|--target) ac_prev=TARGET;;
-target=*|--target=*) TARGET="$ac_optarg" ;;
-version|--version)
- echo "This is TIFF configure $Revision: 1.32 $"
+ echo "This is TIFF configure $Revision: 1.34 $"
exit 0
;;
-help|--help) usage; exit 0;;
@@ -1071,6 +1071,7 @@ Note "Selecting programs used during installation."
#
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`
@@ -1452,14 +1453,14 @@ esac
if [ "${JPEG}" = yes ]; then
test -z "${CONF_JPEG:-}" && CONF_JPEG="-DJPEG_SUPPORT"
- test -z "${LIBJPEG:-}" && LIBJPEG="${DIR_JPEGLIB}/libjpeg.a"
+ test -z "${LIBJPEG:-}" && LIBJPEG="-L${DIR_JPEGLIB} -ljpeg"
else
CONF_JPEG=
LIBJPEG=
fi
if [ "${ZIP}" = yes ]; then
test -z "${CONF_ZIP:-}" && CONF_ZIP="-DZIP_SUPPORT"
- test -z "${LIBGZ:-}" && LIBGZ="${DIR_GZLIB}/libz.a"
+ test -z "${LIBGZ:-}" && LIBGZ="-L${DIR_GZLIB} -lz"
else
CONF_ZIP=
LIBGZ=
@@ -1476,7 +1477,9 @@ relativize()
if [ $SRCDIR_IS_LIBTIFF = no ]; then
(for i do
case "$i" in
- /*) echo "$i" ;;
+ /*|-l*) echo "$i" ;;
+ -L|-L/*) echo "$i" ;;
+ -L*) echo "$i" | sed 's;-L;-L../;' ;;
*) echo "../$i" ;;
esac
done) | tr '\012' ' '
@@ -1561,6 +1564,7 @@ cat>>confsed<<EOF
/@PORT@/s;;${PORT};g
/@PORTFUNCS@/s;;${PORTFUNCS};g
/@RANLIB@/s;;${RANLIB};g
+/@SCRIPT_SH@/s;;${SCRIPT_SH};g
/@SED@/s;;${SED};g
/@SETMAKE@/s;;${SETMAKE};g
/@SRCDIR@/s;;${SRCDIR};g
diff --git a/contrib/mac-cw/Makefile.script b/contrib/mac-cw/Makefile.script
new file mode 100644
index 00000000..85614c81
--- /dev/null
+++ b/contrib/mac-cw/Makefile.script
@@ -0,0 +1,72 @@
+
+(* You must manually set the top-level PATHNAME here; everything else is automatic *)
+
+set PATHNAME to "ritter:tiff-v3.4beta028:"
+set PRINTING to "NO"
+
+set MKG3STATES to PATHNAME & "mkg3states.mw"
+set LIBTIFF to PATHNAME & "libtiff-68K.mw"
+set TIFFINFO to PATHNAME & "tiffinfo.mw"
+
+with timeout of 60000 seconds
+ tell application "MW C/C++ 68K 1.2.2"
+
+ activate
+
+
+ (* Create tif_fax3sm.c file *)
+ Create Project {file MKG3STATES}
+ Add Files {"mkg3states.c", "mkg3_main.c", "getopt.c"}
+ Add Files {"MacOS.lib"} To Segment 2
+ Add Files {"ANSI (4i/8d) C.68K.Lib"} To Segment 3
+ Add Files {"SIOUX.68K.Lib"} To Segment 4
+ Add Files {"MathLib68K (4i/8d).Lib"} To Segment 5
+
+ Set Preferences To {Activate CPlusPlus:false, ARM Conformance:false, ANSI Keywords Only:false, Require Function Prototypes:false, Expand Trigraph Sequences:false, Enums Always Ints:false, MPW Pointer Type Rules:false, Prefix File:"mac_main.h"}
+ Set Preferences To {Illegal Pragmas:false, Empty Declarations:false, Possible Errors:false, Unused Variables:false, Unused Arguments:false, Extra Commas:false, Extended Error Checking:false}
+ Set Preferences To {Code Model:2, Struct Alignment:0, MC68020 CodeGen:false, MC68881 CodeGen:false, Four Bytes Ints:true, Eight Byte Double:true, Peephole Optimizer:true, CSE Optimizer:true, Optimize For Size:true, Far Data:true, Use Profiler:false, Far Virtual Function Tables:false, Far String Constants:true}
+ Set Preferences To {MacsBug Symbols:2, Generate SYM File:false, Full Path In Sym Files:true, Generate Link Map:false, Generate A6 Stack Frames:true, The Debugger Aware:false, Link Single Segment:false, Fast Link:true}
+ Set Preferences To {Project Type:0, File Name:"mkg3states", File Creator:"????", File Type:"APPL"}
+
+ Make Project
+ Run Project
+ Remove Binaries
+ Close Project
+
+
+ (* Create LIBTIFF *)
+ Create Project {file LIBTIFF}
+ Add Files {"tif_apple.c", "tif_aux.c", "tif_close.c", "tif_codec.c", "tif_compress.c", "tif_dumpmode.c", "tif_error.c", "tif_flush.c", "tif_lzw.c", "tif_next.c", "tif_open.c", "tif_packbits.c"}
+ Add Files {"tif_fax3.c"} To Segment 2
+ Add Files {"tif_dirinfo.c", "tif_dir.c", "tif_dirwrite.c", "tif_dirread.c"} To Segment 3
+ Add Files {"tif_predict.c", "tif_print.c", "tif_read.c", "tif_strip.c", "tif_swab.c", "tif_thunder.c", "tif_tile.c", "tif_version.c", "tif_zip.c", "tif_jpeg.c", "tif_warning.c", "tif_write.c"} To Segment 4
+ Add Files {"tif_fax3sm.c"} To Segment 5
+ Add Files {"tif_getimage.c"} To Segment 6
+
+ Set Preferences To {Activate CPlusPlus:false, ARM Conformance:false, ANSI Keywords Only:false, Require Function Prototypes:false, Expand Trigraph Sequences:false, Enums Always Ints:false, MPW Pointer Type Rules:false, Prefix File:"MacHeaders68K"}
+ Set Preferences To {Illegal Pragmas:false, Empty Declarations:false, Possible Errors:false, Unused Variables:false, Unused Arguments:false, Extra Commas:false, Extended Error Checking:false}
+ Set Preferences To {Code Model:2, Struct Alignment:0, MC68020 CodeGen:false, MC68881 CodeGen:false, Four Bytes Ints:true, Eight Byte Double:true, Peephole Optimizer:true, CSE Optimizer:true, Optimize For Size:true, Far Data:true, Use Profiler:false, Far Virtual Function Tables:false, Far String Constants:true}
+ Set Preferences To {MacsBug Symbols:2, Generate SYM File:true, Full Path In Sym Files:true, Generate Link Map:false, Generate A6 Stack Frames:true, The Debugger Aware:false, Link Single Segment:false, Fast Link:true}
+ Set Preferences To {Project Type:2, File Name:"libtiff-68K", File Creator:"????", File Type:"APPL"}
+ Make Project
+ Close Project
+
+ Create Project {file TIFFINFO}
+ Add Files {"tiffinfo.c", "mac_main.c", "getopt.c"}
+ Add Files {"MacOS.lib"} To Segment 2
+ Add Files {"ANSI (4i/8d) C.68K.Lib"} To Segment 3
+ Add Files {"SIOUX.68K.Lib"} To Segment 4
+ Add Files {"MathLib68K (4i/8d).Lib"} To Segment 5
+ Add Files {"libtiff-68K"} To Segment 6
+
+ Set Preferences To {Activate CPlusPlus:false, ARM Conformance:false, ANSI Keywords Only:false, Require Function Prototypes:false, Expand Trigraph Sequences:false, Enums Always Ints:false, MPW Pointer Type Rules:false, Prefix File:"mac_main.h"}
+ Set Preferences To {Illegal Pragmas:false, Empty Declarations:false, Possible Errors:false, Unused Variables:false, Unused Arguments:false, Extra Commas:false, Extended Error Checking:false}
+ Set Preferences To {Code Model:2, Struct Alignment:0, MC68020 CodeGen:false, MC68881 CodeGen:false, Four Bytes Ints:true, Eight Byte Double:true, Peephole Optimizer:true, CSE Optimizer:true, Optimize For Size:true, Far Data:true, Use Profiler:false, Far Virtual Function Tables:false, Far String Constants:true}
+ Set Preferences To {MacsBug Symbols:2, Generate SYM File:false, Full Path In Sym Files:true, Generate Link Map:false, Generate A6 Stack Frames:true, The Debugger Aware:false, Link Single Segment:false, Fast Link:true}
+ Set Preferences To {Project Type:0, File Name:"tiffinfo", File Creator:"????", File Type:"APPL"}
+
+ Make Project
+ Close Project
+
+ end tell
+end timeout
diff --git a/contrib/mac-cw/README b/contrib/mac-cw/README
new file mode 100644
index 00000000..a9734694
--- /dev/null
+++ b/contrib/mac-cw/README
@@ -0,0 +1,18 @@
+----------------------------------------------------
+Build instructions for LIBTIFF - CodeWarrior (6.1):
+----------------------------------------------------
+
+In this directory you will find a Makefile.script Applescript
+file, which should be run in order to build the libtiff code
+using MetroWerks CodeWarrior.
+
+Refer to the "metrowerks.note" instructions on building the
+library for 68k and PowerPC native code, as well as building
+some of the libtiff tools, which are rather unix-like, but
+at least give an example of how to link everything together.
+
+ Questions, comments, bug reports to Niles Ritter
+ (ndr@tazboy.jpl.nasa.gov). Sam Leffler takes no responsibility
+ for the viability of this stuff.
+
+ -Niles.
diff --git a/contrib/mac-cw/mac_main.c b/contrib/mac-cw/mac_main.c
new file mode 100644
index 00000000..294655de
--- /dev/null
+++ b/contrib/mac-cw/mac_main.c
@@ -0,0 +1,20 @@
+/*
+ * mac_main.c -- The REAL entry point which
+ * calls the tools main code. For the tools
+ * the symbol "main" has been #defined to "tool_main"
+ * so that this entry point may be used to access
+ * the user-input first.
+ */
+
+#undef main
+
+int
+main()
+{
+ int argc;
+ char **argv;
+
+ argc=ccommand(&argv);
+
+ return tool_main(argc,argv); // Call the tool "main()" routine
+}
diff --git a/contrib/mac-cw/mac_main.h b/contrib/mac-cw/mac_main.h
new file mode 100644
index 00000000..523300f7
--- /dev/null
+++ b/contrib/mac-cw/mac_main.h
@@ -0,0 +1,12 @@
+/*
+ * mac_main.h -- redefines main entry point
+ */
+
+#ifndef _mac_main_h
+#define _mac_main_h
+
+#undef main
+#define main tool_main
+
+#endif /* _mac_main_h */
+
diff --git a/contrib/mac-cw/metrowerks.note b/contrib/mac-cw/metrowerks.note
new file mode 100644
index 00000000..9917cfd5
--- /dev/null
+++ b/contrib/mac-cw/metrowerks.note
@@ -0,0 +1,84 @@
+----------------------------------------------------
+Build instructions for LIBTIFF - CodeWarrior (6.1):
+----------------------------------------------------
+
+Note: there is a bug in CW earlier than 6.1 which will generate
+16-bit offset link errors for any projects using libtiff; you must
+download the CodeWarrior 6.1 patch located at:
+
+ ftp://ftp.metrowerks.com/pub/updates/metro-patches-61.hqx
+
+unpack the archive, insert the files and recompile the libraries
+using the AppleScript provided.
+
+
+1. Make sure that the directory containing these files is under
+ the "contrib" directory of the tiff folder; otherwise, some
+ access path preferences will need to be updated.
+
+2. The instructions below are for the 68k platform build.
+ A similar script can be put together for the PPC version,
+ or you can just directly convert the projects. Be sure to
+ use the native libraries as well. NOTE: if anyone cooks
+ up an equivalent script for PPC, send it to me and I'll include
+ it with the rest of the package.
+
+3. Open the file Makefile.script with an AppleScript Editor
+ and change the PATHNAME variable to point to your
+ top-level TIFF directory
+
+4. Run the Script. It will do the following things:
+
+ 4a. Prompt you for the current location of the CodeWarrior 68K
+ program.
+
+ 4b. Create the source file "tif_fax3sm.c":
+
+ i) Build the project CW project mkg3states.cw. It will
+ produce a small program called mkg3states. Only a
+ 68k version is provided, since you only have to run
+ this code once, and it only takes a few seconds.
+
+ ii) Run the built mkg3states program:
+
+ The program will temporarily take over ALL of the CPU, so
+ don't panic. After a few seconds it will produce a file called
+ "tif_fax3sm.c".
+
+ 4c. Build the library project libtiff-68K.mw, producing library
+ called libtiff-68K.
+
+ 4d. Build program project tiffinfo.mw; it will produce a
+ program called tiffinfo, which can dump the tiff tags of
+ a named file. Passing in no arguments will dump a help file
+ for the program. It is unix-flavored, but hey, it works.
+
+5 When the script finishes, you will have a usable libtiff-68K
+ library, a passable "tiffinfo" program, and the projects used
+ to build them. Note that to get tiffinfo to work I have put
+ an include file in the project that redefines main(), and
+ then have a mac_main.c program that calls ccommand() first
+ and passes that to the actual main code. A real mac app,
+ of course, would never use this stuff at all...
+
+ . The tiffinfo.mw project may be used as a template to build
+ most of the other libtiff tools, or your own code. When
+ modifying a copy of the project, you will most likely need
+ to update the "Access Paths" directory if it is moved out of
+ the contrib folder.
+
+6. If you are going to create a project from scratch, be sure
+ to set up the preferences with
+
+ 4-byte ints
+ 8-byte doubles
+ Far Code/Far Data
+ Large Linking model
+
+ and everything should work fine. If the console-style error
+ reports bother you, you can always override the error and
+ warning mechanism with TIFFSetErrorHandler to do something
+ more Mac-like.
+
+Questions, comments to Niles Ritter (ndr@tazboy.jpl.nasa.gov).
+
diff --git a/contrib/mac-cw/mkg3_main.c b/contrib/mac-cw/mkg3_main.c
new file mode 100644
index 00000000..b31c8d10
--- /dev/null
+++ b/contrib/mac-cw/mkg3_main.c
@@ -0,0 +1,14 @@
+/*
+ * mkg3_main.c -- passes fake arguments into main
+ */
+
+#undef main
+
+int
+main()
+{
+ static char *argv[4] = {
+ "mkg3states", "-c", "const", "tif_fax3sm.c" };
+
+ return tool_main(4,argv); // Call the tool "main()" routine
+}
diff --git a/contrib/mac-cw/version.h b/contrib/mac-cw/version.h
new file mode 100644
index 00000000..3c5c56e1
--- /dev/null
+++ b/contrib/mac-cw/version.h
@@ -0,0 +1,4 @@
+#define VERSION \
+"LIBTIFF, Version 3.4beta028 \n"\
+"Copyright (c) 1988-1995 Sam Leffler\n"\
+"Copyright (c) 1991-1996 Silicon Graphics, Inc."
diff --git a/contrib/vms/libtiff/tiffshraxp.opt b/contrib/vms/libtiff/tiffshraxp.opt
index 94e6abb402ce251230f8be89f875ab351aa167c4..fbf029e24a1e128ed9f2f2fbdd80d15153c5bd2a 100755
GIT binary patch
literal 3221
zcma)9NmJuE6h4z*@#qs>l}@J#H8qzUoDE!+g^5k5K2fs$oM><)k1P{1zkZ(Nm<A$y
z`l|2kyDnj~2q5F)85PJ}b14c)d4`ZmW#75jg5Dv7{%l4Mkz(oyTxbaliXBtPBBJJd
zw#Ck6$Dd4>MCp&c&|fWwU*`VEG7fq--}?RQFGO+)_ZhMRq0AGe(F)&lLF!&m6=VR2
zavza75oYqxg~JX7up}{t2t0t2rRD;Q&TX*p!tvd3KK<*#n|FV7|FqKYP$6t37FKeC
zDHpu*OQyiG4DvF{cnoPN;_96XOL}sy3wc%+WF~`@)ZwdEjBuuboQ0SqU;@$6vS=x@
zqDQnLMX11kN)$1|;vooOxeCbxh<8kEG3kP&AgTi=zmKwn11Cdv?1kKypwJ}1XrxD$
z=VTqTmi53(66^FYW62Ja4ipLL?F2s;qt*OrGaZMk_3-Lj=fZ@0yu<i8q%02a*Q@b#
z^01zEYbcY2>sjveQe&VM&mBw^+90u13Wc6<g|U|E=wPoX*7DGZH7Tw*-HNA5Np&u9
zmaK9Vj(3X3lI<PN&j=CH!9jJfYj~b8&Ca1))H9A*(u_<nWo4$(O|p=Q!#=+-0dQ~_
z^6}UY!x?)WkWPQ&h0~{ZIfqN?1VQa7V9*;-J!%I1>zk@dmbT4Ssf~ScZgPzq<qp^#
z<$Fc5p`{kq$dXZ+rl<ncrK8pi!T<12MNEz-4K-r~oG9FNV+hvl(85k=3+wI3^Ub(B
zkC>4h#7s~-H=s>o&FI4s*N!;X0t5c9LnuYDC0c~qF1ceO$<Wa(M9@&Mggi1OXzDgI
zn`zNt)`3OAPAYvKq=2Bg6k9jqDaDRdlg+#*3bzOoUz#&+qYUUqHqDLu2DNnVra6qK
z7@j-(sJO<K)LFc}(%+M~3(Hb8*Ln@NFxS=B;J_KD+3!oUHU$+2?O>Wb^;#eFe$d9M
z7F5QGz&$}WwlP2F>EaS*bRuY;rg3ife501@S_>t0Q=Js&))PkUw#Jvx+%F&TC$mHM
zw2Wo^9ypnhve#>4M!OM%+6ccG9ci&1Xs^3QxM?#}39B?M@ME{MhVpHg_iIHYDJY|s
zih3|}>Df(SbkPk%*NH$(=ya0ic-dw$Vj0j$W=;+-%XbW}%7X46N^2d5uf_lq5VH~=
zd7^j2i5Gh2;4rUty!axO_3Q7s^#@#;3)JYfN0!xM6O$@*<xAmN!a5gKCUO5cv~NJ1
zf4Wy{j(GoZH?>-QbK0!^x6)g)Leq*n?Sjw6Ts6UIpg7C@14YZ+azV88h1BM3>_Sv(
zkbAD_;DB7=3zub)9V_W(5Kkl>!=J)ws^4IzLEA(!Cl?*X^!1l|Ku-Bnwo$0KsEXKg
ab??jQZ#ow1?*tJTo!{xRu=dtJJO2Tz!Q)l{
literal 3221
lcmeIuF#!Mo0K%a4Pi+hzh(KY$fB^#r3>YwAz<`0{zyJ)D00961
diff --git a/dist/tiff.alpha b/dist/tiff.alpha
index 3907e4a2..cd85e195 100644
--- a/dist/tiff.alpha
+++ b/dist/tiff.alpha
@@ -1 +1 @@
-define ALPHA 028
+define ALPHA 029
diff --git a/html/Makefile.in b/html/Makefile.in
index 3c7b2909..90d48c57 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -1,4 +1,4 @@
-# $Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.6 1996/01/10 19:36:59 sam Exp $
+# $Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.8 1996/02/09 21:28:38 sam Exp $
#
# @WARNING@
#
@@ -39,7 +39,7 @@ PORT = ${DEPTH}/port
# TARGET: @TARGET@
# CCOMPILER: @CCOMPILER@
#
-SHELL = /bin/sh
+SHELL = @SCRIPT_SH@
NULL =
ECHO = echo
MV = mv
@@ -65,6 +65,8 @@ HTMLFILES=\
v3.4beta016.html \
v3.4beta018.html \
v3.4beta024.html \
+ v3.4beta028.html \
+ v3.4beta029.html \
${NULL}
IMAGES=\
images/back.gif \
diff --git a/html/build.html b/html/build.html
index 362678f0..51ebb5d3 100644
--- a/html/build.html
+++ b/html/build.html
@@ -20,7 +20,8 @@ <H5>
<UL>
<LI><A HREF=#UNIX>Building on a UNIX system</A>.
-<LI><A HREf=#Mac>Building on a Macintosh system</A>.
+<LI><A HREf=#MacMPW>Building on a Macintosh system with MPW</A>.
+<LI><A HREf=#MacCW>Building on a Macintosh system with CodeWarrior</A>.
<LI><A HREF=#PC>Building on an MS-DOS or Windows system</A>.
<LI><A HREF=#VMS>Building on a VMS system</A>.
<LI><A HREF=#Acorn>Building on an Acorn RISC OS system</A>.
@@ -161,9 +162,7 @@ <H5>
Configuration files are just shell scripts that define
shell variables that control the configuration process.
For example, the following file might be used on a BSDI system to
-configure the software for installation in the <B>/usr/contrib</B>
- area and to make use of the Adobe Font Metric files that are already
-distributed as part of the BSDI 1.1 distribution:
+configure the software for installation in the <B>/usr/contrib</B> area.
<PRE>
#
@@ -175,9 +174,9 @@ <H5>
</PRE>
<P>
-For a complete list of the possible configuration parameters, look
-at the sample <B>config.site</B> file provided in the distribution
-or check the section below.
+For a complete list of the possible configuration parameters look
+at the sample <B>config.site</B> file provided in the distribution; the
+section below describes some of the more important parameters.
<A NAME="Packages"><P><HR WIDTH=65% ALIGN=right><H3>Configuring Optional Packages/Support</H3></A>
@@ -210,6 +209,8 @@ <H5>
Support for JPEG-encoded data requires the Independent JPEG Group (IJG)
<TT>libjpeg</TT> distribution; this software is available at
<A HREF=ftp://ftp.uu.net/graphics/jpeg/>ftp.uu.net:/graphics/jpeg/</A>.
+If JPEG support is enabled the <TT>DIRS_LIBINC</TT> and <TT>DIR_JPEGLIB</TT>
+parameters should also be set (see below).
By default JPEG support is not configured.
<P>
@@ -221,6 +222,8 @@ <H5>
this software is available at
<A HREF=ftp://ftp.uu.net/pub/archiving/zip/zlib/>ftp.uu.net:/pub/archiving/zip/zlib/</A>
(or try <A HREF=ftp://quest.jpl.nasa.gov/beta/zlib/>quest.jpl.nasa.gov:/beta/zlib/</A>).
+If ZIP support is enabled the <TT>DIRS_LIBINC</TT> and <TT>DIR_GZLIB</TT>
+parameters should also be set (see below).
By default this package is not configured.
</DL>
@@ -439,6 +442,18 @@ <H5>
default this is <B>/usr/local/bin</B>.</TD>
</TR>
+<TR>
+<TD VALIGN=top><TT>DIR_GZLIB</TT></TD>
+<TD>The options to pass to the C compiler to reference the zlib library
+when ZIP support is enabled; e.g. ``<TT>-L../src/zlib -lgz</TT>''.</TD>
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>DIR_JPEGLIB</TT></TD>
+<TD>The options to pass to the C compiler to reference the JPEG library
+when JPEG support is enabled; e.g. ``<TT>-L/usr/local/lib -ljpeg</TT>''.</TD>
+</TR>
+
<TR>
<TD VALIGN=top><TT>DIR_LIB</TT></TD>
<TD>The directory to install libraries and DSO's; by default
@@ -451,6 +466,14 @@ <H5>
pages should be installed.</TD>
</TR>
+<TR>
+<TD VALIGN=top><TT>DIRS_LIBINC</TT></TD>
+<TD>A space-separated list of directories in which to search for
+include files when building the library and tools.
+If JPEG or ZIP support is configured this parameter should include
+the directories where the associated include files are located.</TD>
+</TR>
+
<TR>
<TD VALIGN=top><TT>DSOOPTS</TT></TD>
<TD>When DSO's are built, the options to specify to <TT>CC</TT>
@@ -565,7 +588,7 @@ <H5>
</I>
-<A NAME=Mac><P><HR><H2>Building the Software on a Macintosh</H2></A>
+<A NAME=MacMPW><P><HR><H2>Building the Software on a Macintosh with MPW</H2></A>
The directory <B>contrib/mac-mpw</B> contains support for
compiling the library and tools under the MPW Shell on a
@@ -596,6 +619,28 @@ <H5>
+<A NAME=MacCW><P><HR><H2>Building the Software on a Macintosh with CodeWarrior</H2></A>
+
+The directory <B>contrib/mac-cw</B> contains support for
+compiling the library and tools with MetroWerks CodeWarrior 6.1
+on a Macintosh system.
+This support was contributed by Niles Ritter
+(<A HREF=mailto:ndr@tazboy.jpl.nasa.gov>ndr@tazboy.jpl.nasa.gov</A>).
+
+<P>
+[<I>From the file <B>contrib/mac-cw/README</B>.</I>]
+
+In this directory you will find a Makefile.script Applescript
+file, which should be run in order to build the libtiff code
+using MetroWerks CodeWarrior.
+
+Refer to the "metrowerks.note" instructions on building the
+library for 68k and PowerPC native code, as well as building
+some of the libtiff tools, which are rather unix-like, but
+at least give an example of how to link everything together.
+
+
+
<A NAME=VMS><P><HR><H2>Building the Software on a VMS System</H2></A>
The VMS port was done by Karsten Spang
@@ -992,7 +1037,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: 1995/10/16 21:46:06 $
+Last updated: $Date: 1996/02/09 22:08:41 $
</ADDRESS>
</BODY>
diff --git a/html/index.html b/html/index.html
index cc9adf34..86de3779 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.4beta028.html">v3.4beta028</A><BR>
+<B>Latest Software</B>: <A HREF="v3.4beta029.html">v3.4beta029</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/01/10 20:27:41 $
+Last updated: $Date: 1996/02/09 21:28:38 $
</ADDRESS>
</BODY>
diff --git a/html/v3.4beta028.html b/html/v3.4beta028.html
new file mode 100644
index 00000000..bec8b88c
--- /dev/null
+++ b/html/v3.4beta028.html
@@ -0,0 +1,145 @@
+<HTML>
+<HEAD>
+<TITLE>
+Changes in TIFF v3.4beta028
+</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.4beta028<BR>
+<B>Previous Version</B>: <A HREF=v3.4beta024.html>v3.4beta024</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="#man">Changes in the manual pages</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>a <TT>-noninteractive</TT> flag was added to configure to
+ control whether or not it prints and prompts for configuration information
+<LI>various typos and fixes were made in configure for the the
+ library-only build support (this and other configure fixes from
+ Richard Mlynarik <A HREF=mailto:mly@adoc.xerox.com><mly@adoc.xerox.com></A>)
+<LI>bugs were fixed in the handling of pathnames supplied for external
+ pac
(Patch may be truncated, please check the link at the top of this post.)