diff options
| author | Sam Leffler <sam@engr.sgi.com> | 1996-05-21 18:59:50 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@codelibre.net> | 2022-06-22 19:36:47 +0100 |
| commit | 717c3420db282530d388682c1c63c4f2e9daae13 (patch) | |
| tree | 3ddade824b8bafacd71c78c87d83281bf27ccd58 | |
| parent | 901d6d6f2fb4fcde08a758a61f99de0a3fa6abaa (diff) | |
| download | libtiff-git-717c3420db282530d388682c1c63c4f2e9daae13.tar.gz | |
v3.4beta034 releasev3.4beta034
144 files changed, 312 insertions, 270 deletions
diff --git a/Makefile.in b/Makefile.in index 37009577..87999b7e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ #! smake -# $Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.51 1996/04/29 19:51:20 sam Rel $ +# $Header: /usr/people/sam/tiff/RCS/Makefile.in,v 1.54 1996/05/21 18:59:50 sam Exp $ # # @WARNING@ # @@ -259,6 +259,7 @@ TIFFFILES=\ html/misc.html \ html/support.html \ html/tools.html \ + html/v3.4beta034.html \ html/v3.4beta033.html \ html/v3.4beta032.html \ html/v3.4beta031.html \ @@ -346,7 +347,7 @@ alpha: # stamp relevant files according to current alpha alpha.stamp: - VERSION=`awk '{print "Alpha" $$3}' ${SRCDIR}/dist/tiff.alpha`;\ + VERSION="Alpha@DIST_ALPHA@"; \ NOW=`date`; \ for i in ${TIFFFILES}; do \ REV=`rlog -h -d"$$NOW" ${SRCDIR}/$$i|fgrep 'head:'|awk '{print $$2}'`;\ @@ -354,8 +355,10 @@ alpha.stamp: done purge-old-alphas: - VERSIONS=`awk '{for (i=1; i<=$$3; i++) printf " -nAlpha%03d",i}'\ - ${SRCDIR}/dist/tiff.alpha`; \ + 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; \ @@ -368,7 +371,7 @@ alphadiff: # create alpha distribution archive alpha.tar: - VERSION="v`cat ${SRCDIR}/VERSION``awk '{print $$3}' ${SRCDIR}/dist/tiff.alpha`"; \ + VERSION="@VERSION@"; \ rm -f tiff-$$VERSION $$VERSION $$VERSION-tar; \ ln -s ${SRCDIR} tiff-$$VERSION; \ (for i in ${DISTFILES}; do \ @@ -388,16 +391,15 @@ release: ${MAKE} release.tar release.stamp: - VERSION="Release`sed 's/\./_/g' ${SRCDIR}/VERSION`"; \ NOW=`date`; \ for i in ${TIFFFILES}; do \ REV=`rlog -h -d"$$NOW" ${SRCDIR}/$$i|fgrep 'head:'|awk '{print $$2}'`;\ - rcs "-N$$VERSION:$$REV" "-sRel:$$REV" ${SRCDIR}/$$i && co -sRel ${SRCDIR}/$$i; \ + rcs "-NRelease@DIST_MAJOR@_@DIST_MINOR@_@DIST_TYPE@:$$REV" "-sRel:$$REV" ${SRCDIR}/$$i && co -sRel ${SRCDIR}/$$i; \ done # create release distribution archive release.tar: - VERSION=v`cat ${SRCDIR}/VERSION`; \ + VERSION="@VERSION@"; \ rm -f tiff-$$VERSION $$VERSION $$VERSION-tar; \ ln -s ${SRCDIR} tiff-$$VERSION; \ (for i in ${DISTFILES}; do \ @@ -1,4 +1,4 @@ -$Header: /usr/people/sam/tiff/RCS/README,v 1.27 1996/01/10 19:31:42 sam Rel $ +$Header: /usr/people/sam/tiff/RCS/README,v 1.27 1996/01/10 19:31:42 sam Exp $ TIFF Software Distribution -------------------------- @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/RCS/TODO,v 1.4 1996/02/09 22:09:00 sam Rel $ +# $Header: /usr/people/sam/tiff/RCS/TODO,v 1.4 1996/02/09 22:09:00 sam Exp $ o tiffcmp read data by strip/tile instead of scanline o YCbCr sampling support @@ -1 +1 @@ -3.4 +3.4beta diff --git a/config.site b/config.site index ee69fce7..8bc38b91 100644 --- a/config.site +++ b/config.site @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/RCS/config.site,v 1.12 1996/02/22 18:16:44 sam Rel $ +# $Header: /usr/people/sam/tiff/RCS/config.site,v 1.12 1996/02/22 18:16:44 sam Exp $ # # TIFF Software # @@ -1,5 +1,5 @@ #!/bin/sh -# $Header: /usr/people/sam/tiff/RCS/configure,v 1.48 1996/04/26 03:36:20 sam Rel $ +# $Header: /usr/people/sam/tiff/RCS/configure,v 1.49 1996/05/21 18:30:05 sam Exp $ # # Tag Image File Format (TIFF) Software # @@ -145,7 +145,7 @@ do -target|--target) ac_prev=TARGET;; -target=*|--target=*) TARGET="$ac_optarg" ;; -version|--version) - echo "This is TIFF configure $Revision: 1.48 $" + echo "This is TIFF configure $Revision: 1.49 $" exit 0 ;; -help|--help) usage; exit 0;; @@ -250,12 +250,14 @@ else VERSIONFILE=$SRCDIR/VERSION ALPHAFILE=$SRCDIR/dist/tiff.alpha fi -VERSION="v`cat $VERSIONFILE``awk '{print $3}' $ALPHAFILE`" DATE=`date` -DIST_MAJOR=`echo $VERSION | sed 's/v\([0-9][0-9]*\)\..*/\1/'` -DIST_MINOR=`echo $VERSION | sed 's/v.*\.\([0-9][0-9]*\).*/\1/'` -DIST_ALPHA=`echo $VERSION | sed -e 's/.*beta//' -e 's/.*release//'` +eval `cat $VERSIONFILE | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\(.*\)/DIST_MAJOR=\1; DIST_MINOR=\2; DIST_TYPE=\3/'` +DIST_ALPHA=`awk '{print $3}' $ALPHAFILE` +VERSION="v${DIST_MAJOR}.${DIST_MINOR}${DIST_TYPE}" +if [ $DIST_TYPE = beta ]; then + VERSION="${VERSION}${DIST_ALPHA}" +fi Note() { @@ -1080,11 +1082,12 @@ Note "" Note "Checking for Dynamic Shared Object (DSO) support." if [ "$DSO" = auto ]; then DSOSUF_VERSION= + DSOLD='${LD}' + TIFFLIBREF= case $TARGET-$CC-$ISGCC in *-irix5.2*) if (findApp rld /lib:/usr/lib:$PATH) >/dev/null 2>&1; then DSOSUF=so - DSOLD='${LD}' DSOOPTS='-elf -shared -no_unresolved -all' DSO=IRIX52 fi @@ -1099,14 +1102,12 @@ if [ "$DSO" = auto ]; then ;; *-aix*) DSOSUF=a - DSOLD='${LD}' DSOOPTS='-r' LIBCOPTS="-bM\:SRE" DSO=AIX ;; *-hpux*) DSOSUF=sl - DSOLD='${LD}' DSOOPTS='-b' LIBCOPTS="+Z" # LIBPORT="-Wl,+b${DIR_LIB}" @@ -1114,19 +1115,23 @@ if [ "$DSO" = auto ]; then ;; *-solaris*-yes) DSOSUF=so - DSOLD='${LD}' DSOOPTS='-G' LIBCOPTS="-fpic" DSO=SOLARIS ;; *-solaris*) DSOSUF=so - DSOLD='${LD}' DSOOPTS='-G' LIBCOPTS="-K PIC" DSO=SOLARIS ;; - *-linux) + *-netbsd*) + DSOSUF=so.${DIST_MAJOR}.0 + LIBCOPTS='-fPIC' + DSO=NETBSD + TIFFLIBREF='-L${DEPTH}/libtiff -ltiff' + ;; + *-linux*) if [ -x /lib/libc.so.5 ]; then DSOSUF=so.${DIST_MAJOR} DSOSUF_VERSION=${DSOSUF}.${DIST_MINOR}.${DIST_ALPHA} @@ -1142,6 +1147,7 @@ if [ "$DSO" = auto ]; then ;; *) DSO=no;; esac + test -z "$TIFFLIBREF" && TIFFLIBREF="\${DEPTH}/libtiff/libtiff.${DSOSUF}" test -z "$DSOSUF_VERSION" && DSOSUF_VERSION=${DSOSUF} fi if [ "$DSO" != no ]; then @@ -1689,6 +1695,7 @@ cat>>confsed<<EOF /@DIST_ALPHA@/s;;${DIST_ALPHA};g /@DIST_MAJOR@/s;;${DIST_MAJOR};g /@DIST_MINOR@/s;;${DIST_MINOR};g +/@DIST_TYPE@/s;;${DIST_TYPE};g /@DSO@/s;;${DSO};g /@DSOSUF@/s;;${DSOSUF};g /@DSOSUF_VERSION@/s;;${DSOSUF_VERSION};g @@ -1723,6 +1730,7 @@ cat>>confsed<<EOF /@RELSRCDIR@/s;;`relativize ${SRCDIR}`;g /@STRIP@/s;;${STRIP};g /@TARGET@/s;;${TARGET};g +/@TIFFLIBREF@/s;;${TIFFLIBREF};g /@VERSION@/s;;${VERSION};g /@VERSIONFILE@/s;;`relativize ${VERSIONFILE}`;g /@WARNING@/s;;Warning, this file was automatically created by the TIFF configure script;g diff --git a/dist/newalpha b/dist/newalpha index 2aa50117..5b1a2669 100755 --- a/dist/newalpha +++ b/dist/newalpha @@ -1,5 +1,5 @@ #! /bin/sh -# $Header: /usr/people/sam/tiff/dist/RCS/newalpha,v 1.1 1994/12/17 18:27:58 sam Rel $ +# $Header: /usr/people/sam/tiff/dist/RCS/newalpha,v 1.1 1994/12/17 18:27:58 sam Exp $ if test -r tiff.alpha; then ALPHA=`cat tiff.alpha`; rm -f tiff.alpha echo "$ALPHA" | awk '{ printf "define ALPHA %03d\n", $3+1}' > tiff.alpha diff --git a/dist/newversion b/dist/newversion index b6b739fc..22a5d294 100644 --- a/dist/newversion +++ b/dist/newversion @@ -1,5 +1,5 @@ #! /bin/sh -# $Header: /usr/people/sam/tiff/dist/RCS/newversion,v 1.2 1996/01/10 19:37:40 sam Rel $ +# $Header: /usr/people/sam/tiff/dist/RCS/newversion,v 1.2 1996/01/10 19:37:40 sam Exp $ # # TIFF Software # diff --git a/dist/tiff.alpha b/dist/tiff.alpha index 159a8a70..18528f82 100644 --- a/dist/tiff.alpha +++ b/dist/tiff.alpha @@ -1 +1 @@ -define ALPHA 033 +define ALPHA 034 diff --git a/dist/tiff.spec b/dist/tiff.spec index 5e9000f2..a4efc953 100644 --- a/dist/tiff.spec +++ b/dist/tiff.spec @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/dist/RCS/tiff.spec,v 1.3 1996/01/10 19:37:41 sam Rel $ +# $Header: /usr/people/sam/tiff/dist/RCS/tiff.spec,v 1.3 1996/01/10 19:37:41 sam Exp $ # # TIFF Software # diff --git a/dist/tiff.version b/dist/tiff.version index 8d4b2f37..c89a3244 100644 --- a/dist/tiff.version +++ b/dist/tiff.version @@ -1 +1 @@ -define TIFF_VNUM "3.4 (release)" +define TIFF_VNUM 3.4beta diff --git a/html/Makefile.in b/html/Makefile.in index 852e371f..2011d692 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.10 1996/04/29 19:51:20 sam Rel $ +# $Header: /usr/people/sam/tiff/html/RCS/Makefile.in,v 1.11 1996/05/21 18:57:50 sam Exp $ # # @WARNING@ # @@ -70,6 +70,7 @@ HTMLFILES=\ v3.4beta031.html \ v3.4beta032.html \ v3.4beta033.html \ + v3.4beta034.html \ ${NULL} IMAGES=\ images/back.gif \ diff --git a/html/index.html b/html/index.html index 6b397aeb..e6c7a26e 100644 --- a/html/index.html +++ b/html/index.html @@ -12,7 +12,7 @@ TIFF Software </H1> <B>Latest Release</B>: <A HREF="v3.4beta033.html">v3.4</A><BR> -<B>Latest Software</B>: <A HREF="v3.4beta033.html">v3.4</A><BR> +<B>Latest Software</B>: <A HREF="v3.4beta034.html">v3.4beta034</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 @@ the master FTP site listed above. <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/29 19:16:09 $ +Last updated: $Date: 1996/05/21 19:01:11 $ </ADDRESS> </BODY> diff --git a/html/v3.4beta034.html b/html/v3.4beta034.html new file mode 100644 index 00000000..ef910bf5 --- /dev/null +++ b/html/v3.4beta034.html @@ -0,0 +1,67 @@ +<HTML> +<HEAD> +<TITLE> +Changes in TIFF v3.4beta034 +</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.4beta034<BR> +<B>Previous Version</B>: <A HREF=v3.4beta033.html>v3.4beta033</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> +</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>support was added for building the library as a DSO under NetBSD +<LI>a bug was fixed in the DSO support for Linux +<LI>the handling of version strings has changed slightly to simplify parsing +<LI>a new parameter, <TT>TIFFLIBREF</TT>, was added to control how the + library is referenced when linking programs in the <B>tools</B> directory +</UL> + +<P><HR WIDTH=65% ALIGN=right> + +<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A> + +<UL> +<LI>DSO creation under Solaris now forces the DSO name with a <TT>-h</TT> option +<LI>the interface to the <B>mkversion</B> program was changed + to eliminate the need to parse files +<LI>a bug was fixed in the EOL-detection logic of the T.4/T.6 decoder +<LI>ANSI IT8 TIFF/IT tag definitions were added to <B>tiff.h</B> +</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/05/21 18:57:37 $. +</ADDRESS> + +</BODY> +</HTML> diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index e58e1b71..65ef0e95 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.34 1996/04/26 03:36:20 sam Rel $ +# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.36 1996/05/21 18:30:39 sam Exp $ # # Tag Image File Format Library # @@ -171,7 +171,7 @@ IRIX52dso: ${OBJS} touch $@ # Solaris 2.4 SOLARISdso: ${OBJS} - ${LD} -L@DIR_LIB@ -G -o libtiff.@DSOSUF@ ${OBJS} + ${LD} -L@DIR_LIB@ -G -h libtiff.@DSOSUF@ -o libtiff.@DSOSUF@ ${OBJS} touch $@ # HP-UX A.09.03 HPUXdso: ${OBJS} @@ -190,6 +190,14 @@ AIXdso: ${OBJS} ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o rm -f shr.o touch $@ +# NetBSD 1.1 and newer +NETBSDdso: ${OBJS} + @rm -f libtiff_pic.a + @${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q` + ${RANLIB} libtiff_pic.a + ${LD} -x -Bshareable -Bforcearchive -o libtiff.@DSOSUF@ libtiff_pic.a + rm -f libtiff_pic.a + touch $@ # linux ELF shared lib rule LINUXdso: ${OBJS} ${CC} -shared -Wl,-soname,libtiff.@DSOSUF@ \ @@ -204,12 +212,10 @@ OSFdso: ${OBJS} ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h -ALPHA = @ALPHAFILE@ -VERSION = @VERSIONFILE@ - -version.h: ${VERSION} ${ALPHA} ${SRCDIR}/mkversion.c +version.h: ${SRCDIR}/mkversion.c ${CC} -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c - rm -f version.h; ./mkversion -v ${VERSION} -a ${ALPHA} version.h + rm -f version.h; ./mkversion \ + @DIST_MAJOR@ @DIST_MINOR@ @DIST_ALPHA@ @DIST_TYPE@ version.h tif_version.o: version.h # diff --git a/libtiff/Makefile.lcc b/libtiff/Makefile.lcc index 57603f12..46f8cbce 100644 --- a/libtiff/Makefile.lcc +++ b/libtiff/Makefile.lcc @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.lcc,v 1.3 1996/01/10 19:32:51 sam Rel $ +# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.lcc,v 1.3 1996/01/10 19:32:51 sam Exp $ # # Tag Image File Format Library # diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c index b627c621..dc477afb 100644 --- a/libtiff/mkg3states.c +++ b/libtiff/mkg3states.c @@ -1,4 +1,4 @@ -/* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkg3states.c,v 1.34 1996/01/10 19:32:52 sam Rel $ */ +/* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkg3states.c,v 1.34 1996/01/10 19:32:52 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/mkspans.c b/libtiff/mkspans.c index ae0cb189..6a4fe312 100644 --- a/libtiff/mkspans.c +++ b/libtiff/mkspans.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/mkspans.c,v 1.10 1996/01/10 19:32:53 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/mkspans.c,v 1.10 1996/01/10 19:32:53 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/mkversion.c b/libtiff/mkversion.c index dda73268..f52665cb 100755 --- a/libtiff/mkversion.c +++ b/libtiff/mkversion.c @@ -1,4 +1,4 @@ -/* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkversion.c,v 1.4 1996/01/10 19:34:25 sam Rel $ */ +/* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkversion.c,v 1.5 1996/05/21 18:19:48 sam Exp $ */ /* * Copyright (c) 1995-1996 Sam Leffler @@ -25,104 +25,39 @@ */ /* - * Generate a library version string for systems that - * do not have a shell (by default this is done with - * awk and echo from the Makefile). + * Generate a library version string. * - * This was written by Peter Greenham for Acorn systems. - * - * Syntax: mkversion [-v version-file] [-a alpha-file] [<outfile>] + * Syntax: mkversion major minor alpha type [outfile] */ #include <stdio.h> #include <stdlib.h> #include <string.h> -static void -usage(void) -{ - fprintf(stderr, - "usage: mkversion [-v version-file] [-a alpha-file] [outfile]\n"); - exit(-1); -} - -static FILE* -openFile(char* filename) -{ - FILE* fd = fopen(filename, "r"); - if (fd == NULL) { - fprintf(stderr, "mkversion: %s: Could not open for reading.\n", - filename); - exit(-1); - } - return (fd); -} - int main(int argc, char* argv[]) { - char* versionFile = "../VERSION"; - char* alphaFile = "../dist/tiff.alpha"; - char version[128]; - char alpha[128]; FILE* fd; - char* cp; - argc--, argv++; - while (argc > 0 && argv[0][0] == '-') { - if (strcmp(argv[0], "-v") == 0) { - if (argc < 1) - usage(); - argc--, argv++; - versionFile = argv[0]; - } else if (strcmp(argv[0], "-a") == 0) { - if (argc < 1) - usage(); - argc--, argv++; - alphaFile = argv[0]; - } else - usage(); - argc--, argv++; - } - fd = openFile(versionFile); - if (fgets(version, sizeof (version)-1, fd) == NULL) { - fprintf(stderr, "mkversion: No version information in %s.\n", - versionFile); - exit(-1); - } - cp = strchr(version, '\n'); - if (cp) - *cp = '\0'; - fclose(fd); - fd = openFile(alphaFile); - if (fgets(alpha, sizeof (alpha)-1, fd) == NULL) { - fprintf(stderr, "mkversion: No alpha information in %s.\n", alphaFile); - exit(-1); - } - fclose(fd); - cp = strchr(alpha, ' '); /* skip to 3rd blank-separated field */ - if (cp) - cp = strchr(cp+1, ' '); - if (cp) { /* append alpha to version */ - char* tp; - for (tp = strchr(version, '\0'), cp++; *tp = *cp; tp++, cp++) - ; - if (tp[-1] == '\n') - tp[-1] = '\0'; - } else { - fprintf(stderr, "mkversion: Malformed alpha information in %s.\n", - alphaFile); + if (argc != 5 && argc != 6) { + fprintf(stderr, "usage: %s major minor alpha type [outfile]\n", + argv[0]); exit(-1); } - if (argc > 0) { - fd = fopen(argv[0], "w"); + if (argc == 6) { + fd = fopen(argv[5], "w"); if (fd == NULL) { - fprintf(stderr, "mkversion: %s: Could not open for writing.\n", - argv[0]); + fprintf(stderr, "%s: %s: Could not open for writing.\n", + argv[0], argv[5]); exit(-1); } } else fd = stdout; - fprintf(fd, "#define VERSION \"LIBTIFF, Version %s\\n", version); + if (strcmp(argv[4], "beta") == 0) + fprintf(fd, "#define VERSION \"LIBTIFF, Version %s.%sbeta%s\\n", + argv[1], argv[2], argv[3]); + else + fprintf(fd, "#define VERSION \"LIBTIFF, Version %s.%s%s (alpha %s)\\n", + argv[1], argv[2], argv[4], argv[3]); fprintf(fd, "Copyright (c) 1988-1996 Sam Leffler\\n"); fprintf(fd, "Copyright (c) 1991-1996 Silicon Graphics, Inc.\"\n"); diff --git a/libtiff/t4.h b/libtiff/t4.h index d35c9beb..30dc5aef 100644 --- a/libtiff/t4.h +++ b/libtiff/t4.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/t4.h,v 1.15 1996/01/10 19:33:20 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/t4.h,v 1.15 1996/01/10 19:33:20 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_acorn.c b/libtiff/tif_acorn.c index a5b25b7e..40ce58dd 100755 --- a/libtiff/tif_acorn.c +++ b/libtiff/tif_acorn.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_acorn.c,v 1.1 1995/09/06 00:24:10 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_acorn.c,v 1.1 1995/09/06 00:24:10 sam Exp $ */ /* * Copyright (c) 1988-1995 Sam Leffler diff --git a/libtiff/tif_apple.c b/libtiff/tif_apple.c index 2e67aef6..81f87724 100644 --- a/libtiff/tif_apple.c +++ b/libtiff/tif_apple.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_apple.c,v 1.22 1996/02/06 23:50:58 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_apple.c,v 1.22 1996/02/06 23:50:58 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_atari.c b/libtiff/tif_atari.c index 56cc0e7d..04966856 100644 --- a/libtiff/tif_atari.c +++ b/libtiff/tif_atari.c @@ -1,4 +1,4 @@ -/* "$Header: /usr/people/sam/tiff/libtiff/RCS/tif_atari.c,v 1.5 1996/01/10 19:32:54 sam Rel $" */ +/* "$Header: /usr/people/sam/tiff/libtiff/RCS/tif_atari.c,v 1.5 1996/01/10 19:32:54 sam Exp $" */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c index 89eac282..debfd382 100644 --- a/libtiff/tif_aux.c +++ b/libtiff/tif_aux.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_aux.c,v 1.32 1996/01/10 19:32:55 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_aux.c,v 1.32 1996/01/10 19:32:55 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_close.c b/libtiff/tif_close.c index 6f67f2c1..8f416876 100644 --- a/libtiff/tif_close.c +++ b/libtiff/tif_close.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_close.c,v 1.30 1996/01/10 19:32:55 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_close.c,v 1.30 1996/01/10 19:32:55 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_codec.c b/libtiff/tif_codec.c index e539c19a..a821de14 100644 --- a/libtiff/tif_codec.c +++ b/libtiff/tif_codec.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_codec.c,v 1.9 1996/04/05 17:36:53 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_codec.c,v 1.9 1996/04/05 17:36:53 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_compress.c b/libtiff/tif_compress.c index 767ed22e..ce99489e 100644 --- a/libtiff/tif_compress.c +++ b/libtiff/tif_compress.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_compress.c,v 1.51 1996/01/10 19:32:57 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_compress.c,v 1.51 1996/01/10 19:32:57 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 0193062e..82187349 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dir.c,v 1.156 1996/01/10 20:37:08 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dir.c,v 1.156 1996/01/10 20:37:08 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h index c0b55df9..c2021dfa 100644 --- a/libtiff/tif_dir.h +++ b/libtiff/tif_dir.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dir.h,v 1.4 1996/01/10 19:33:21 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dir.h,v 1.4 1996/01/10 19:33:21 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c index 1f34e2e3..ac221244 100644 --- a/libtiff/tif_dirinfo.c +++ b/libtiff/tif_dirinfo.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirinfo.c,v 1.37 1996/01/10 19:32:58 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirinfo.c,v 1.37 1996/01/10 19:32:58 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c index 42f61902..6fd3a66b 100644 --- a/libtiff/tif_dirread.c +++ b/libtiff/tif_dirread.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirread.c,v 1.71 1996/03/29 16:35:17 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirread.c,v 1.71 1996/03/29 16:35:17 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c index d6d6d9b1..849cc11a 100644 --- a/libtiff/tif_dirwrite.c +++ b/libtiff/tif_dirwrite.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirwrite.c,v 1.56 1996/04/29 21:56:21 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirwrite.c,v 1.56 1996/04/29 21:56:21 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dumpmode.c b/libtiff/tif_dumpmode.c index 94e4c39f..08214652 100644 --- a/libtiff/tif_dumpmode.c +++ b/libtiff/tif_dumpmode.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dumpmode.c,v 1.40 1996/01/10 19:33:00 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dumpmode.c,v 1.40 1996/01/10 19:33:00 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_error.c b/libtiff/tif_error.c index e0ea86c8..35eb5f76 100644 --- a/libtiff/tif_error.c +++ b/libtiff/tif_error.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_error.c,v 1.21 1996/01/10 19:33:01 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_error.c,v 1.21 1996/01/10 19:33:01 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c index 51887ce4..2d5df7f0 100644 --- a/libtiff/tif_fax3.c +++ b/libtiff/tif_fax3.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.c,v 1.135 1996/02/08 20:21:27 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.c,v 1.135 1996/02/08 20:21:27 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h index 9f7be320..9a9817c9 100644 --- a/libtiff/tif_fax3.h +++ b/libtiff/tif_fax3.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.h,v 1.29 1996/02/09 22:51:07 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.h,v 1.30 1996/05/10 14:45:33 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler @@ -262,7 +262,7 @@ static const char* StateNames[] = { NeedBits16(11,eoflab); \ if (GetBits(11) == 0) \ break; \ - ClrBits(11); \ + ClrBits(1); \ } \ } \ for (;;) { \ diff --git a/libtiff/tif_flush.c b/libtiff/tif_flush.c index fa510c52..5cf4c67f 100644 --- a/libtiff/tif_flush.c +++ b/libtiff/tif_flush.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_flush.c,v 1.22 1996/01/10 19:33:03 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_flush.c,v 1.22 1996/01/10 19:33:03 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c index 699e2a72..92c1d1ba 100644 --- a/libtiff/tif_getimage.c +++ b/libtiff/tif_getimage.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_getimage.c,v 1.39 1996/01/10 19:33:04 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_getimage.c,v 1.39 1996/01/10 19:33:04 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c index a6874b0a..c415fa64 100644 --- a/libtiff/tif_jpeg.c +++ b/libtiff/tif_jpeg.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_jpeg.c,v 1.25 1996/01/10 19:33:04 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_jpeg.c,v 1.25 1996/01/10 19:33:04 sam Exp $ */ /* * Copyright (c) 1994-1996 Sam Leffler diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c index cf9caf66..d5eada58 100644 --- a/libtiff/tif_lzw.c +++ b/libtiff/tif_lzw.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_lzw.c,v 1.70 1996/01/10 19:33:05 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_lzw.c,v 1.70 1996/01/10 19:33:05 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_msdos.c b/libtiff/tif_msdos.c index fb2750b6..5a44c8ae 100644 --- a/libtiff/tif_msdos.c +++ b/libtiff/tif_msdos.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_msdos.c,v 1.14 1996/01/10 19:33:06 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_msdos.c,v 1.14 1996/01/10 19:33:06 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c index 519192eb..eb191c11 100644 --- a/libtiff/tif_next.c +++ b/libtiff/tif_next.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_next.c,v 1.27 1996/01/10 19:33:07 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_next.c,v 1.27 1996/01/10 19:33:07 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_open.c b/libtiff/tif_open.c index d8ec72f2..6ae2c130 100644 --- a/libtiff/tif_open.c +++ b/libtiff/tif_open.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_open.c,v 1.63 1996/01/10 19:33:07 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_open.c,v 1.63 1996/01/10 19:33:07 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_packbits.c b/libtiff/tif_packbits.c index dc3193c2..7a2e4452 100644 --- a/libtiff/tif_packbits.c +++ b/libtiff/tif_packbits.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_packbits.c,v 1.49 1996/01/10 19:33:08 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_packbits.c,v 1.49 1996/01/10 19:33:08 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c index 556d599a..62a38179 100644 --- a/libtiff/tif_predict.c +++ b/libtiff/tif_predict.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_predict.c,v 1.4 1996/01/10 19:33:09 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_predict.c,v 1.4 1996/01/10 19:33:09 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_predict.h b/libtiff/tif_predict.h index 5ffb204d..56a0ecdb 100644 --- a/libtiff/tif_predict.h +++ b/libtiff/tif_predict.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_predict.h,v 1.2 1996/01/10 19:33:22 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_predict.h,v 1.2 1996/01/10 19:33:22 sam Exp $ */ /* * Copyright (c) 1995-1996 Sam Leffler diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c index bd3f8a3f..5b919ecf 100644 --- a/libtiff/tif_print.c +++ b/libtiff/tif_print.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_print.c,v 1.67 1996/02/16 05:54:21 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_print.c,v 1.67 1996/02/16 05:54:21 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c index fa06279a..ce78af1c 100644 --- a/libtiff/tif_read.c +++ b/libtiff/tif_read.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_read.c,v 1.70 1996/01/10 19:33:11 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_read.c,v 1.70 1996/01/10 19:33:11 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c index ebc7a669..4897c2b6 100644 --- a/libtiff/tif_strip.c +++ b/libtiff/tif_strip.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_strip.c,v 1.25 1996/01/10 19:33:11 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_strip.c,v 1.25 1996/01/10 19:33:11 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_swab.c b/libtiff/tif_swab.c index 4abf560a..5afb71d6 100644 --- a/libtiff/tif_swab.c +++ b/libtiff/tif_swab.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_swab.c,v 1.22 1996/01/10 19:33:12 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_swab.c,v 1.22 1996/01/10 19:33:12 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_thunder.c b/libtiff/tif_thunder.c index 41b8ffa5..fbc93c26 100644 --- a/libtiff/tif_thunder.c +++ b/libtiff/tif_thunder.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_thunder.c,v 1.29 1996/01/10 19:33:13 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_thunder.c,v 1.29 1996/01/10 19:33:13 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_tile.c b/libtiff/tif_tile.c index 8620ffef..64b89a84 100644 --- a/libtiff/tif_tile.c +++ b/libtiff/tif_tile.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_tile.c,v 1.27 1996/01/10 19:33:14 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_tile.c,v 1.27 1996/01/10 19:33:14 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c index d40ecccc..ae0f6bb8 100644 --- a/libtiff/tif_unix.c +++ b/libtiff/tif_unix.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_unix.c,v 1.16 1996/01/10 19:33:14 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_unix.c,v 1.16 1996/01/10 19:33:14 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_version.c b/libtiff/tif_version.c index 8d4b39e9..7ff3af08 100644 --- a/libtiff/tif_version.c +++ b/libtiff/tif_version.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_version.c,v 1.16 1996/01/10 19:33:15 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_version.c,v 1.16 1996/01/10 19:33:15 sam Exp $ */ /* * Copyright (c) 1992-1996 Sam Leffler * Copyright (c) 1992-1996 Silicon Graphics, Inc. diff --git a/libtiff/tif_vms.c b/libtiff/tif_vms.c index 02b356e1..aede7734 100644 --- a/libtiff/tif_vms.c +++ b/libtiff/tif_vms.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_vms.c,v 1.21 1996/03/29 16:37:53 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_vms.c,v 1.21 1996/03/29 16:37:53 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_warning.c b/libtiff/tif_warning.c index 0f7f58d9..7ec97cbe 100644 --- a/libtiff/tif_warning.c +++ b/libtiff/tif_warning.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_warning.c,v 1.21 1996/01/10 19:33:17 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_warning.c,v 1.21 1996/01/10 19:33:17 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_win3.c b/libtiff/tif_win3.c index a29f3ad1..16e24781 100644 --- a/libtiff/tif_win3.c +++ b/libtiff/tif_win3.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_win3.c,v 1.6 1996/01/10 19:33:17 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_win3.c,v 1.6 1996/01/10 19:33:17 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c index 1e7f4776..ea5e6996 100644 --- a/libtiff/tif_win32.c +++ b/libtiff/tif_win32.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_win32.c,v 1.3 1996/01/10 19:33:18 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_win32.c,v 1.3 1996/01/10 19:33:18 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_write.c b/libtiff/tif_write.c index e987a342..c5b64d22 100644 --- a/libtiff/tif_write.c +++ b/libtiff/tif_write.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_write.c,v 1.72 1996/01/10 19:33:19 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_write.c,v 1.72 1996/01/10 19:33:19 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c index 8bdaaf40..84d2c8e3 100644 --- a/libtiff/tif_zip.c +++ b/libtiff/tif_zip.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_zip.c,v 1.8 1996/03/07 17:00:23 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_zip.c,v 1.8 1996/03/07 17:00:23 sam Exp $ */ /* * Copyright (c) 1995-1996 Sam Leffler diff --git a/libtiff/tiff.h b/libtiff/tiff.h index d6e146e7..fefce51b 100644 --- a/libtiff/tiff.h +++ b/libtiff/tiff.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiff.h,v 1.71 1996/04/29 22:16:05 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiff.h,v 1.72 1996/05/10 14:43:54 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler @@ -150,6 +150,11 @@ typedef enum { #define COMPRESSION_CCITTRLEW 32771 /* #1 w/ word alignment */ #define COMPRESSION_PACKBITS 32773 /* Macintosh RLE */ #define COMPRESSION_THUNDERSCAN 32809 /* ThunderScan RLE */ +/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <dkelly@etsinc.com) */ +#define COMPRESSION_IT8CTPAD 32895 /* IT8 CT w/padding */ +#define COMPRESSION_IT8LW 32896 /* IT8 Linework RLE */ +#define COMPRESSION_IT8MP 32897 /* IT8 Monochrome picture */ +#define COMPRESSION_IT8BL 32898 /* IT8 Binary line art */ /* compression codes 32908-32911 are reserved for Pixar */ #define COMPRESSION_PIXARFILM 32908 /* Pixar companded 10bit LZW */ #define COMPRESSION_PIXARLOG 32909 /* Pixar companded 11bit ZIP */ @@ -311,6 +316,21 @@ typedef enum { #define TIFFTAG_WRITERSERIALNUMBER 33405 /* device serial number */ /* tag 33432 is listed in the 6.0 spec w/ unknown ownership */ #define TIFFTAG_COPYRIGHT 33432 /* copyright string */ +/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <dkelly@etsinc.com) */ +#define TIFFTAG_IT8SITE 34016 /* site name */ +#define TIFFTAG_IT8COLORSEQUENCE 34017 /* color seq. [RGB,CMYK,etc] */ +#define TIFFTAG_IT8HEADER 34018 /* DDES Header */ +#define TIFFTAG_IT8RASTERPADDING 34019 /* raster scanline padding */ +#define TIFFTAG_IT8BITSPERRUNLENGTH 34020 /* # of bits in short run */ +#define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021/* # of bits in long run */ +#define TIFFTAG_IT8COLORTABLE 34022 /* LW colortable */ +#define TIFFTAG_IT8IMAGECOLORINDICATOR 34023 /* BP/BL image color switch */ +#define TIFFTAG_IT8BKGCOLORINDICATOR 34024 /* BP/BL bg color switch */ +#define TIFFTAG_IT8IMAGECOLORVALUE 34025 /* BP/BL image color value */ +#define TIFFTAG_IT8BKGCOLORVALUE 34026 /* BP/BL bg color value */ +#define TIFFTAG_IT8PIXELINTENSITYRANGE 34027 /* MP pixel intensity value */ +#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028 /* HC transparency switch */ +#define TIFFTAG_IT8COLORCHARACTERIZATION 34029 /* color character. table */ /* tags 34232-34236 are private tags registered to Texas Instruments */ #define TIFFTAG_FRAMECOUNT 34232 /* Sequence Frame Count */ /* tag 34750 is a private tag registered to Pixel Magic */ diff --git a/libtiff/tiffcomp.h b/libtiff/tiffcomp.h index 516e6384..c8673592 100644 --- a/libtiff/tiffcomp.h +++ b/libtiff/tiffcomp.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffcomp.h,v 1.49 1996/04/29 21:56:21 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffcomp.h,v 1.49 1996/04/29 21:56:21 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler diff --git a/libtiff/tiffconf.h b/libtiff/tiffconf.h index 1bb9d868..13f1ccde 100644 --- a/libtiff/tiffconf.h +++ b/libtiff/tiffconf.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffconf.h,v 1.13 1996/04/05 17:36:53 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffconf.h,v 1.13 1996/04/05 17:36:53 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler * Copyright (c) 1991-1996 Silicon Graphics, Inc. diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h index 2c1e16ff..e4a8d4ea 100644 --- a/libtiff/tiffio.h +++ b/libtiff/tiffio.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffio.h,v 1.93 1996/03/07 17:00:14 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffio.h,v 1.93 1996/03/07 17:00:14 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index e4ffc59b..6412898a 100644 --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffiop.h,v 1.80 1996/04/05 17:36:53 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffiop.h,v 1.80 1996/04/05 17:36:53 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/man/Makefile.in b/man/Makefile.in index 51ece1d6..39b70460 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,5 +1,5 @@ #! smake -# $Header: /usr/people/sam/tiff/man/RCS/Makefile.in,v 1.13 1996/03/18 20:56:29 sam Rel $ +# $Header: /usr/people/sam/tiff/man/RCS/Makefile.in,v 1.13 1996/03/18 20:56:29 sam Exp $ # # @WARNING@ # diff --git a/man/TIFFClose.3t b/man/TIFFClose.3t index ee52858f..7c89f9d8 100644 --- a/man/TIFFClose.3t +++ b/man/TIFFClose.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFClose.3t,v 1.11 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFClose.3t,v 1.11 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFError.3t b/man/TIFFError.3t index c35753b6..17fd33a4 100644 --- a/man/TIFFError.3t +++ b/man/TIFFError.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFError.3t,v 1.13 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFError.3t,v 1.13 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFFlush.3t b/man/TIFFFlush.3t index 174c3b15..23bbec15 100644 --- a/man/TIFFFlush.3t +++ b/man/TIFFFlush.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFFlush.3t,v 1.12 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFFlush.3t,v 1.12 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFGetField.3t b/man/TIFFGetField.3t index a10d8b39..fa8f8ec5 100644 --- a/man/TIFFGetField.3t +++ b/man/TIFFGetField.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFGetField.3t,v 1.16 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFGetField.3t,v 1.16 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFOpen.3t b/man/TIFFOpen.3t index 9ae448b7..d33394a8 100644 --- a/man/TIFFOpen.3t +++ b/man/TIFFOpen.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFOpen.3t,v 1.14 1996/01/09 22:45:06 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFOpen.3t,v 1.14 1996/01/09 22:45:06 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFPrintDirectory.3t b/man/TIFFPrintDirectory.3t index 2475d78d..cf96701f 100644 --- a/man/TIFFPrintDirectory.3t +++ b/man/TIFFPrintDirectory.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFPrintDirectory.3t,v 1.7 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFPrintDirectory.3t,v 1.7 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFRGBAImage.3t b/man/TIFFRGBAImage.3t index 444ce80f..1a7090c7 100644 --- a/man/TIFFRGBAImage.3t +++ b/man/TIFFRGBAImage.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFRGBAImage.3t,v 1.1 1995/10/11 22:53:37 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFRGBAImage.3t,v 1.1 1995/10/11 22:53:37 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadDirectory.3t b/man/TIFFReadDirectory.3t index 6f6427bd..d124018d 100644 --- a/man/TIFFReadDirectory.3t +++ b/man/TIFFReadDirectory.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadDirectory.3t,v 1.13 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadDirectory.3t,v 1.13 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadEncodedStrip.3t b/man/TIFFReadEncodedStrip.3t index c50da79a..ce4ccc2d 100644 --- a/man/TIFFReadEncodedStrip.3t +++ b/man/TIFFReadEncodedStrip.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadEncodedStrip.3t,v 1.15 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadEncodedStrip.3t,v 1.15 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadEncodedTile.3t b/man/TIFFReadEncodedTile.3t index f0312bea..f865654b 100644 --- a/man/TIFFReadEncodedTile.3t +++ b/man/TIFFReadEncodedTile.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadEncodedTile.3t,v 1.11 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadEncodedTile.3t,v 1.11 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadRGBAImage.3t b/man/TIFFReadRGBAImage.3t index 20ead300..9c1b5e4d 100644 --- a/man/TIFFReadRGBAImage.3t +++ b/man/TIFFReadRGBAImage.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadRGBAImage.3t,v 1.10 1995/10/11 22:53:44 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadRGBAImage.3t,v 1.10 1995/10/11 22:53:44 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadRawStrip.3t b/man/TIFFReadRawStrip.3t index dd3de579..3c237b46 100644 --- a/man/TIFFReadRawStrip.3t +++ b/man/TIFFReadRawStrip.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadRawStrip.3t,v 1.12 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadRawStrip.3t,v 1.12 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadRawTile.3t b/man/TIFFReadRawTile.3t index 1e2e3196..23a5e7da 100644 --- a/man/TIFFReadRawTile.3t +++ b/man/TIFFReadRawTile.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadRawTile.3t,v 1.11 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadRawTile.3t,v 1.11 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadScanline.3t b/man/TIFFReadScanline.3t index 976f6d19..7abad14b 100644 --- a/man/TIFFReadScanline.3t +++ b/man/TIFFReadScanline.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadScanline.3t,v 1.15 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadScanline.3t,v 1.15 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFReadTile.3t b/man/TIFFReadTile.3t index 67c451fe..d8c116a9 100644 --- a/man/TIFFReadTile.3t +++ b/man/TIFFReadTile.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadTile.3t,v 1.11 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFReadTile.3t,v 1.11 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFSetDirectory.3t b/man/TIFFSetDirectory.3t index 48b6d4e3..5eab2796 100644 --- a/man/TIFFSetDirectory.3t +++ b/man/TIFFSetDirectory.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFSetDirectory.3t,v 1.12 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFSetDirectory.3t,v 1.12 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFSetField.3t b/man/TIFFSetField.3t index e9eb6293..f292733a 100644 --- a/man/TIFFSetField.3t +++ b/man/TIFFSetField.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFSetField.3t,v 1.15 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFSetField.3t,v 1.15 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFWarning.3t b/man/TIFFWarning.3t index 75a1dff7..a3e59902 100644 --- a/man/TIFFWarning.3t +++ b/man/TIFFWarning.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWarning.3t,v 1.13 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWarning.3t,v 1.13 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFWriteDirectory.3t b/man/TIFFWriteDirectory.3t index 9455774c..f390737d 100644 --- a/man/TIFFWriteDirectory.3t +++ b/man/TIFFWriteDirectory.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteDirectory.3t,v 1.12 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteDirectory.3t,v 1.12 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFWriteEncodedStrip.3t b/man/TIFFWriteEncodedStrip.3t index fa765aa8..6be98cc2 100644 --- a/man/TIFFWriteEncodedStrip.3t +++ b/man/TIFFWriteEncodedStrip.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteEncodedStrip.3t,v 1.13 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteEncodedStrip.3t,v 1.13 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFWriteEncodedTile.3t b/man/TIFFWriteEncodedTile.3t index 8d4bf850..9decae89 100644 --- a/man/TIFFWriteEncodedTile.3t +++ b/man/TIFFWriteEncodedTile.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteEncodedTile.3t,v 1.10 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteEncodedTile.3t,v 1.10 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFWriteRawStrip.3t b/man/TIFFWriteRawStrip.3t index 7a6ff1e5..ba6d489c 100644 --- a/man/TIFFWriteRawStrip.3t +++ b/man/TIFFWriteRawStrip.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteRawStrip.3t,v 1.12 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteRawStrip.3t,v 1.12 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFWriteRawTile.3t b/man/TIFFWriteRawTile.3t index 2bfb000e..441cd9e3 100644 --- a/man/TIFFWriteRawTile.3t +++ b/man/TIFFWriteRawTile.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteRawTile.3t,v 1.10 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteRawTile.3t,v 1.10 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFWriteScanline.3t b/man/TIFFWriteScanline.3t index b02bad77..a09beecf 100644 --- a/man/TIFFWriteScanline.3t +++ b/man/TIFFWriteScanline.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteScanline.3t,v 1.13 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFWriteScanline.3t,v 1.13 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFbuffer.3t b/man/TIFFbuffer.3t index 273e4438..bb80474a 100644 --- a/man/TIFFbuffer.3t +++ b/man/TIFFbuffer.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFbuffer.3t,v 1.1 1995/10/12 00:43:54 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFbuffer.3t,v 1.1 1995/10/12 00:43:54 sam Exp $ .\" .\" Copyright (c) 1995 Sam Leffler .\" Copyright (c) 1995 Silicon Graphics, Inc. diff --git a/man/TIFFcodec.3t b/man/TIFFcodec.3t index bbd91367..9c0a753c 100644 --- a/man/TIFFcodec.3t +++ b/man/TIFFcodec.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFcodec.3t,v 1.1 1995/10/12 00:04:30 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFcodec.3t,v 1.1 1995/10/12 00:04:30 sam Exp $ .\" .\" Copyright (c) 1995 Sam Leffler .\" Copyright (c) 1995 Silicon Graphics, Inc. diff --git a/man/TIFFmemory.3t b/man/TIFFmemory.3t index a3bb20e4..69464c84 100644 --- a/man/TIFFmemory.3t +++ b/man/TIFFmemory.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFmemory.3t,v 1.1 1995/10/12 00:04:21 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFmemory.3t,v 1.1 1995/10/12 00:04:21 sam Exp $ .\" .\" Copyright (c) 1995 Sam Leffler .\" Copyright (c) 1995 Silicon Graphics, Inc. diff --git a/man/TIFFquery.3t b/man/TIFFquery.3t index 8807e82b..a37ab86d 100644 --- a/man/TIFFquery.3t +++ b/man/TIFFquery.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFquery.3t,v 1.14 1995/10/12 00:44:17 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFquery.3t,v 1.14 1995/10/12 00:44:17 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFsize.3t b/man/TIFFsize.3t index 05b36e1d..f5db2664 100644 --- a/man/TIFFsize.3t +++ b/man/TIFFsize.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFsize.3t,v 1.13 1995/10/12 00:44:17 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFsize.3t,v 1.13 1995/10/12 00:44:17 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFstrip.3t b/man/TIFFstrip.3t index 4b572e1a..506c399b 100644 --- a/man/TIFFstrip.3t +++ b/man/TIFFstrip.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFstrip.3t,v 1.7 1995/10/12 00:44:17 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFstrip.3t,v 1.7 1995/10/12 00:44:17 sam Exp $ .\" .\" Copyright (c) 1992-1995 Sam Leffler .\" Copyright (c) 1992-1995 Silicon Graphics, Inc. diff --git a/man/TIFFswab.3t b/man/TIFFswab.3t index e28e64be..dfb8d56a 100644 --- a/man/TIFFswab.3t +++ b/man/TIFFswab.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFswab.3t,v 1.10 1995/10/11 19:45:29 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFswab.3t,v 1.10 1995/10/11 19:45:29 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/TIFFtile.3t b/man/TIFFtile.3t index c7f0d47a..d9f555c5 100644 --- a/man/TIFFtile.3t +++ b/man/TIFFtile.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFtile.3t,v 1.13 1995/10/12 00:44:17 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/TIFFtile.3t,v 1.13 1995/10/12 00:44:17 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/fax2ps.1 b/man/fax2ps.1 index 4a48190f..9cd1bf4c 100644 --- a/man/fax2ps.1 +++ b/man/fax2ps.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/fax2ps.1,v 1.9 1995/07/05 18:52:42 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/fax2ps.1,v 1.9 1995/07/05 18:52:42 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/fax2tiff.1 b/man/fax2tiff.1 index 5bd42f19..65965c28 100644 --- a/man/fax2tiff.1 +++ b/man/fax2tiff.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/fax2tiff.1,v 1.17 1995/10/11 19:41:58 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/fax2tiff.1,v 1.17 1995/10/11 19:41:58 sam Exp $ .\" .\" Copyright (c) 1990-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/gif2tiff.1 b/man/gif2tiff.1 index dfdccd9c..352dd5e8 100644 --- a/man/gif2tiff.1 +++ b/man/gif2tiff.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/gif2tiff.1,v 1.8 1995/10/11 19:41:58 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/gif2tiff.1,v 1.8 1995/10/11 19:41:58 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/libtiff.3t b/man/libtiff.3t index 542063c9..085729eb 100644 --- a/man/libtiff.3t +++ b/man/libtiff.3t @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/libtiff.3t,v 1.22 1996/01/09 22:47:08 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/libtiff.3t,v 1.22 1996/01/09 22:47:08 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/pal2rgb.1 b/man/pal2rgb.1 index c53f31f1..2b55beb2 100644 --- a/man/pal2rgb.1 +++ b/man/pal2rgb.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/pal2rgb.1,v 1.13 1995/10/11 19:41:59 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/pal2rgb.1,v 1.13 1995/10/11 19:41:59 sam Exp $ .\" .\" Copyright (c) 1990-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/ppm2tiff.1 b/man/ppm2tiff.1 index 1af8ac9c..4ea052b5 100644 --- a/man/ppm2tiff.1 +++ b/man/ppm2tiff.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/ppm2tiff.1,v 1.10 1995/10/11 19:42:00 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/ppm2tiff.1,v 1.10 1995/10/11 19:42:00 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/ras2tiff.1 b/man/ras2tiff.1 index 29a79d21..77f090d0 100644 --- a/man/ras2tiff.1 +++ b/man/ras2tiff.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/ras2tiff.1,v 1.13 1995/10/11 19:42:00 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/ras2tiff.1,v 1.13 1995/10/11 19:42:00 sam Exp $ .\" .\" Copyright (c) 1990-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/rgb2ycbcr.1 b/man/rgb2ycbcr.1 index 93b7f210..029253c4 100644 --- a/man/rgb2ycbcr.1 +++ b/man/rgb2ycbcr.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/rgb2ycbcr.1,v 1.7 1995/10/11 19:42:01 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/rgb2ycbcr.1,v 1.7 1995/10/11 19:42:01 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/sgi2tiff.1 b/man/sgi2tiff.1 index 6c5cb8cb..e40a2a3b 100644 --- a/man/sgi2tiff.1 +++ b/man/sgi2tiff.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/sgi2tiff.1,v 1.8 1995/10/11 19:42:02 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/sgi2tiff.1,v 1.8 1995/10/11 19:42:02 sam Exp $ .\" .\" Copyright (c) 1991-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/thumbnail.1 b/man/thumbnail.1 index 79ff3561..26cbbebc 100644 --- a/man/thumbnail.1 +++ b/man/thumbnail.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/thumbnail.1,v 1.3 1995/10/11 19:42:36 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/thumbnail.1,v 1.3 1995/10/11 19:42:36 sam Exp $ .\" .\" Copyright (c) 1994-1995 Sam Leffler .\" Copyright (c) 1994-1995 Silicon Graphics, Inc. diff --git a/man/tiff2bw.1 b/man/tiff2bw.1 index 1843c7b4..a1f454f5 100644 --- a/man/tiff2bw.1 +++ b/man/tiff2bw.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiff2bw.1,v 1.14 1995/10/11 19:42:03 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiff2bw.1,v 1.14 1995/10/11 19:42:03 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiff2ps.1 b/man/tiff2ps.1 index 8060c34a..5085ec5d 100644 --- a/man/tiff2ps.1 +++ b/man/tiff2ps.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiff2ps.1,v 1.18 1995/10/11 19:42:04 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiff2ps.1,v 1.18 1995/10/11 19:42:04 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffcmp.1 b/man/tiffcmp.1 index 50e48ed4..2cc3059c 100644 --- a/man/tiffcmp.1 +++ b/man/tiffcmp.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffcmp.1,v 1.18 1995/10/11 19:42:04 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffcmp.1,v 1.18 1995/10/11 19:42:04 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffcp.1 b/man/tiffcp.1 index c36357c8..e928c866 100644 --- a/man/tiffcp.1 +++ b/man/tiffcp.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffcp.1,v 1.23 1996/01/10 00:01:03 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffcp.1,v 1.23 1996/01/10 00:01:03 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffdither.1 b/man/tiffdither.1 index 81252eee..f8765deb 100644 --- a/man/tiffdither.1 +++ b/man/tiffdither.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffdither.1,v 1.16 1995/10/11 19:42:06 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffdither.1,v 1.16 1995/10/11 19:42:06 sam Exp $ .\" .\" Copyright (c) 1990-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffdump.1 b/man/tiffdump.1 index 7f3a2f35..bdbb7013 100644 --- a/man/tiffdump.1 +++ b/man/tiffdump.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffdump.1,v 1.14 1995/10/11 19:42:06 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffdump.1,v 1.14 1995/10/11 19:42:06 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffgt.1 b/man/tiffgt.1 index c543fe98..f4e548ab 100644 --- a/man/tiffgt.1 +++ b/man/tiffgt.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffgt.1,v 1.20 1995/10/11 19:42:07 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffgt.1,v 1.20 1995/10/11 19:42:07 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffinfo.1 b/man/tiffinfo.1 index f0447f98..b46ab504 100644 --- a/man/tiffinfo.1 +++ b/man/tiffinfo.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffinfo.1,v 1.17 1995/10/11 19:42:08 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffinfo.1,v 1.17 1995/10/11 19:42:08 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffmedian.1 b/man/tiffmedian.1 index 4af64ea0..3f3bb2f2 100644 --- a/man/tiffmedian.1 +++ b/man/tiffmedian.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffmedian.1,v 1.18 1995/10/11 19:42:09 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffmedian.1,v 1.18 1995/10/11 19:42:09 sam Exp $ .\" .\" Copyright (c) 1990-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/man/tiffsplit.1 b/man/tiffsplit.1 index c9ca5f06..e42a0357 100644 --- a/man/tiffsplit.1 +++ b/man/tiffsplit.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffsplit.1,v 1.5 1995/10/11 19:42:09 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffsplit.1,v 1.5 1995/10/11 19:42:09 sam Exp $ .\" .\" Copyright (c) 1992-1995 Sam Leffler .\" Copyright (c) 1992-1995 Silicon Graphics, Inc. diff --git a/man/tiffsv.1 b/man/tiffsv.1 index d3b71840..3adeeeb8 100644 --- a/man/tiffsv.1 +++ b/man/tiffsv.1 @@ -1,4 +1,4 @@ -.\" $Header: /usr/people/sam/tiff/man/RCS/tiffsv.1,v 1.16 1995/10/11 19:42:10 sam Rel $ +.\" $Header: /usr/people/sam/tiff/man/RCS/tiffsv.1,v 1.16 1995/10/11 19:42:10 sam Exp $ .\" .\" Copyright (c) 1988-1995 Sam Leffler .\" Copyright (c) 1991-1995 Silicon Graphics, Inc. diff --git a/port/Makefile.in b/port/Makefile.in index 11f78449..13893578 100644 --- a/port/Makefile.in +++ b/port/Makefile.in @@ -1,5 +1,5 @@ #! smake -# $Header: /usr/people/sam/tiff/port/RCS/Makefile.in,v 1.6 1996/03/18 20:55:51 sam Rel $ +# $Header: /usr/people/sam/tiff/port/RCS/Makefile.in,v 1.6 1996/03/18 20:55:51 sam Exp $ # # @WARNING@ # diff --git a/port/install.sh.in b/port/install.sh.in index ffe97ad1..c4c52153 100644 --- a/port/install.sh.in +++ b/port/install.sh.in @@ -1,5 +1,5 @@ #! @SCRIPT_SH@ -# $Header: /usr/people/sam/tiff/port/RCS/install.sh.in,v 1.19 1996/01/10 19:36:09 sam Rel $ +# $Header: /usr/people/sam/tiff/port/RCS/install.sh.in,v 1.19 1996/01/10 19:36:09 sam Exp $ # # @WARNING@ # diff --git a/tools/Makefile.in b/tools/Makefile.in index 4b467ce1..193160cb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/tools/RCS/Makefile.in,v 1.18 1996/03/18 20:56:15 sam Rel $ +# $Header: /usr/people/sam/tiff/tools/RCS/Makefile.in,v 1.19 1996/05/21 18:31:15 sam Exp $ # # @WARNING@ # @@ -47,10 +47,13 @@ OPTIMIZER=-O IPATH = -I. -I${SRCDIR} -I${LIBDIR} CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} # -LIBTIFF = ${DEPTH}/libtiff/libtiff.@DSOSUF@ +TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF@ LIBJPEG = @LIBJPEG@ LIBGZ = @LIBGZ@ -LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@ +LIBTIFF = @TIFFLIBREF@ +LIBPORT = @LIBPORT@ +MACHLIBS= @MACHDEPLIBS@ +LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} # OBJS= \ fax2tiff.o \ @@ -123,17 +126,17 @@ clean: # System-independent tools # -tiffinfo: tiffinfo.o ${LIBTIFF} +tiffinfo: tiffinfo.o ${TIFFLIB} ${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS} tiffinfo.o: ${SRCDIR}/tiffinfo.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiffinfo.c -tiffcmp:tiffcmp.o ${LIBTIFF} +tiffcmp:tiffcmp.o ${TIFFLIB} ${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS} tiffcmp.o: ${SRCDIR}/tiffcmp.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiffcmp.c -tiffcp: tiffcp.o ${LIBTIFF} +tiffcp: tiffcp.o ${TIFFLIB} ${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS} tiffcp.o: ${SRCDIR}/tiffcp.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiffcp.c @@ -143,17 +146,17 @@ tiffdump: tiffdump.o tiffdump.o: ${SRCDIR}/tiffdump.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiffdump.c -tiffmedian: tiffmedian.o ${LIBTIFF} +tiffmedian: tiffmedian.o ${TIFFLIB} ${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS} tiffmedian.o: ${SRCDIR}/tiffmedian.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiffmedian.c -tiffsplit: tiffsplit.o ${LIBTIFF} +tiffsplit: tiffsplit.o ${TIFFLIB} ${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS} tiffsplit.o: ${SRCDIR}/tiffsplit.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiffsplit.c -tiff2ps: tiff2ps.o ${LIBTIFF} +tiff2ps: tiff2ps.o ${TIFFLIB} ${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS} tiff2ps.o: ${SRCDIR}/tiff2ps.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiff2ps.c @@ -164,61 +167,61 @@ tiff2ps.o: ${SRCDIR}/tiff2ps.c # # convert RGB image to B&W -tiff2bw: tiff2bw.o ${LIBTIFF} +tiff2bw: tiff2bw.o ${TIFFLIB} ${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS} tiff2bw.o: ${SRCDIR}/tiff2bw.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiff2bw.c # convert B&W image to bilevel w/ FS dithering -tiffdither: tiffdither.o ${LIBTIFF} +tiffdither: tiffdither.o ${TIFFLIB} ${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS} tiffdither.o: ${SRCDIR}/tiffdither.c ${CC} -c ${CFLAGS} ${SRCDIR}/tiffdither.c # simple Sun rasterfile converter -ras2tiff: ras2tiff.o ${LIBTIFF} +ras2tiff: ras2tiff.o ${TIFFLIB} ${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS} ras2tiff.o: ${SRCDIR}/ras2tiff.c ${CC} -c ${CFLAGS} ${SRCDIR}/ras2tiff.c # simple GIF converter -gif2tiff: gif2tiff.o ${LIBTIFF} +gif2tiff: gif2tiff.o ${TIFFLIB} ${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS} gif2tiff.o: ${SRCDIR}/gif2tiff.c ${CC} -c ${CFLAGS} ${SRCDIR}/gif2tiff.c # very limited PBM converter -ppm2tiff: ppm2tiff.o ${LIBTIFF} +ppm2tiff: ppm2tiff.o ${TIFFLIB} ${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS} ppm2tiff.o: ${SRCDIR}/ppm2tiff.c ${CC} -c ${CFLAGS} ${SRCDIR}/ppm2tiff.c # Group 3/4 FAX file converter -fax2tiff: fax2tiff.o ${LIBTIFF} +fax2tiff: fax2tiff.o ${TIFFLIB} ${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS} fax2tiff.o: ${SRCDIR}/fax2tiff.c ${CC} -c -I${LIBDIR} -I${DEPTH}/libtiff ${CFLAGS} ${SRCDIR}/fax2tiff.c # Group 3/4 FAX to encoded PS converter -fax2ps: fax2ps.o ${LIBTIFF} +fax2ps: fax2ps.o ${TIFFLIB} ${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS} fax2ps.o: ${SRCDIR}/fax2ps.c ${CC} -c ${CFLAGS} ${SRCDIR}/fax2ps.c # convert Palette image to RGB -pal2rgb: pal2rgb.o ${LIBTIFF} +pal2rgb: pal2rgb.o ${TIFFLIB} ${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS} pal2rgb.o: ${SRCDIR}/pal2rgb.c ${CC} -c ${CFLAGS} ${SRCDIR}/pal2rgb.c # convert RGB image to YCbCr -rgb2ycbcr: rgb2ycbcr.o ${LIBTIFF} +rgb2ycbcr: rgb2ycbcr.o ${TIFFLIB} ${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS} rgb2ycbcr.o: ${SRCDIR}/rgb2ycbcr.c ${CC} -c ${CFLAGS} ${SRCDIR}/rgb2ycbcr.c # generate thumbnail images from fax (example of SubIFD usage) -thumbnail: thumbnail.o ${LIBTIFF} +thumbnail: thumbnail.o ${TIFFLIB} ${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS} thumbnail.o: ${SRCDIR}/thumbnail.c ${CC} -c ${CFLAGS} ${SRCDIR}/thumbnail.c @@ -231,18 +234,18 @@ thumbnail.o: ${SRCDIR}/thumbnail.c # sgi2tiff converts SGI RGB images to TIFF; it requires # the SGI image library -limage. # -sgi2tiff: sgi2tiff.o ${LIBTIFF} +sgi2tiff: sgi2tiff.o ${TIFFLIB} ${CC} -o sgi2tiff ${CFLAGS} sgi2tiff.o -limage ${LIBS} sgi2tiff.o: ${SRCDIR}/sgi2tiff.c ${CC} -c ${CFLAGS} ${SRCDIR}/sgi2tiff.c # SGI versions of tiffgt & tiffsv that require -lgl -tiffgt: sgigt.o ${LIBTIFF} +tiffgt: sgigt.o ${TIFFLIB} ${CC} -o tiffgt ${CFLAGS} sgigt.o ${LIBS} -lgutil -lgl_s sgigt.o: ${SRCDIR}/sgigt.c ${CC} -c ${CFLAGS} ${SRCDIR}/sgigt.c -tiffsv: sgisv.o ${LIBTIFF} +tiffsv: sgisv.o ${TIFFLIB} ${CC} -o tiffsv ${CFLAGS} sgisv.o ${LIBS} -lgutil -lgl_s sgisv.o: ${SRCDIR}/sgisv.c ${CC} -c ${CFLAGS} ${SRCDIR}/sgisv.c diff --git a/tools/Makefile.lcc b/tools/Makefile.lcc index 079fed33..0e78b453 100644 --- a/tools/Makefile.lcc +++ b/tools/Makefile.lcc @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/tools/RCS/Makefile.lcc,v 1.4 1996/01/10 19:35:26 sam Rel $ +# $Header: /usr/people/sam/tiff/tools/RCS/Makefile.lcc,v 1.4 1996/01/10 19:35:26 sam Exp $ # # TIFF Library Tools # diff --git a/tools/fax2ps.c b/tools/fax2ps.c index 426675db..65f68c90 100644 --- a/tools/fax2ps.c +++ b/tools/fax2ps.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/fax2ps.c,v 1.10 1996/04/29 21:58:49 sam Rel $" */ +/* $Header: /usr/people/sam/tiff/tools/RCS/fax2ps.c,v 1.10 1996/04/29 21:58:49 sam Exp $" */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c index d2e2a555..9ceb5278 100644 --- a/tools/fax2tiff.c +++ b/tools/fax2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/fax2tiff.c,v 1.40 1996/01/10 19:35:27 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/fax2tiff.c,v 1.40 1996/01/10 19:35:27 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c index 935c8cac..263bcff7 100644 --- a/tools/gif2tiff.c +++ b/tools/gif2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/gif2tiff.c,v 1.27 1996/04/22 22:03:26 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/gif2tiff.c,v 1.27 1996/04/22 22:03:26 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c index fec27334..e26d7318 100644 --- a/tools/pal2rgb.c +++ b/tools/pal2rgb.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/pal2rgb.c,v 1.29 1996/01/10 19:35:29 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/pal2rgb.c,v 1.29 1996/01/10 19:35:29 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c index 02be2604..b53e06b7 100644 --- a/tools/ppm2tiff.c +++ b/tools/ppm2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/ppm2tiff.c,v 1.26 1996/04/22 22:03:26 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/ppm2tiff.c,v 1.26 1996/04/22 22:03:26 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/tools/ras2tiff.c b/tools/ras2tiff.c index d168a7c1..a82e9101 100644 --- a/tools/ras2tiff.c +++ b/tools/ras2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/ras2tiff.c,v 1.29 1996/01/10 19:35:30 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/ras2tiff.c,v 1.29 1996/01/10 19:35:30 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/rasterfile.h b/tools/rasterfile.h index 15126e86..30c09a7c 100644 --- a/tools/rasterfile.h +++ b/tools/rasterfile.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/rasterfile.h,v 1.1 1990/10/08 17:24:23 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/rasterfile.h,v 1.1 1990/10/08 17:24:23 sam Exp $ */ /* * Description of header for files containing raster images diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c index b96115ff..f034dc44 100644 --- a/tools/rgb2ycbcr.c +++ b/tools/rgb2ycbcr.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/rgb2ycbcr.c,v 1.27 1996/01/10 19:35:31 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/rgb2ycbcr.c,v 1.27 1996/01/10 19:35:31 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/tools/sgi2tiff.c b/tools/sgi2tiff.c index 223cec59..01d3d7c6 100644 --- a/tools/sgi2tiff.c +++ b/tools/sgi2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/sgi2tiff.c,v 1.26 1996/01/10 19:35:31 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/sgi2tiff.c,v 1.26 1996/01/10 19:35:31 sam Exp $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/tools/sgigt.c b/tools/sgigt.c index 59297181..4e5ed0e7 100644 --- a/tools/sgigt.c +++ b/tools/sgigt.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/sgigt.c,v 1.66 1996/01/10 19:35:32 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/sgigt.c,v 1.66 1996/01/10 19:35:32 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/sgisv.c b/tools/sgisv.c index 96123bfe..3b14ff11 100644 --- a/tools/sgisv.c +++ b/tools/sgisv.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/sgisv.c,v 1.25 1996/01/10 19:35:33 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/sgisv.c,v 1.25 1996/01/10 19:35:33 sam Exp $ */ /* * Copyright (c) 1990-1996 Sam Leffler diff --git a/tools/thumbnail.c b/tools/thumbnail.c index fe703197..a5f72cdb 100644 --- a/tools/thumbnail.c +++ b/tools/thumbnail.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/thumbnail.c,v 1.11 1996/01/10 19:35:33 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/thumbnail.c,v 1.11 1996/01/10 19:35:33 sam Exp $ */ /* * Copyright (c) 1994-1996 Sam Leffler diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c index acae3b77..c0f0945c 100644 --- a/tools/tiff2bw.c +++ b/tools/tiff2bw.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2bw.c,v 1.21 1996/01/10 19:35:34 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2bw.c,v 1.21 1996/01/10 19:35:34 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c index ae704c81..d3e27558 100644 --- a/tools/tiff2ps.c +++ b/tools/tiff2ps.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2ps.c,v 1.48 1996/01/10 19:35:35 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2ps.c,v 1.48 1996/01/10 19:35:35 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/tiffcmp.c b/tools/tiffcmp.c index 13f0c926..570611ab 100644 --- a/tools/tiffcmp.c +++ b/tools/tiffcmp.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcmp.c,v 1.29 1996/01/10 19:35:36 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcmp.c,v 1.29 1996/01/10 19:35:36 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/tiffcp.c b/tools/tiffcp.c index 8663f4c4..c87cc46c 100644 --- a/tools/tiffcp.c +++ b/tools/tiffcp.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcp.c,v 1.48 1996/01/10 19:35:36 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcp.c,v 1.48 1996/01/10 19:35:36 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/tiffdither.c b/tools/tiffdither.c index 355721c3..cf1e671f 100644 --- a/tools/tiffdither.c +++ b/tools/tiffdither.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdither.c,v 1.26 1996/01/10 19:35:37 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdither.c,v 1.26 1996/01/10 19:35:37 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/tiffdump.c b/tools/tiffdump.c index 2b2a9b72..16a9f3a3 100644 --- a/tools/tiffdump.c +++ b/tools/tiffdump.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdump.c,v 1.49 1996/03/29 16:38:33 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdump.c,v 1.49 1996/03/29 16:38:33 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c index d80a99fb..fc53887f 100644 --- a/tools/tiffinfo.c +++ b/tools/tiffinfo.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiffinfo.c,v 1.26 1996/01/10 19:35:39 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiffinfo.c,v 1.26 1996/01/10 19:35:39 sam Exp $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/tools/tiffmedian.c b/tools/tiffmedian.c index ff354fed..967bb185 100644 --- a/tools/tiffmedian.c +++ b/tools/tiffmedian.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiffmedian.c,v 1.18 1995/10/10 00:35:22 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiffmedian.c,v 1.18 1995/10/10 00:35:22 sam Exp $ */ /* * Apply median cut on an image. diff --git a/tools/tiffsplit.c b/tools/tiffsplit.c index 49108e0b..48baf8ec 100644 --- a/tools/tiffsplit.c +++ b/tools/tiffsplit.c @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/tools/RCS/tiffsplit.c,v 1.13 1996/01/10 19:35:40 sam Rel $ */ +/* $Header: /usr/people/sam/tiff/tools/RCS/tiffsplit.c,v 1.13 1996/01/10 19:35:40 sam Exp $ */ /* * Copyright (c) 1992-1996 Sam Leffler |