From 717c3420db282530d388682c1c63c4f2e9daae13 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Tue, 21 May 1996 18:59:50 +0100 Subject: v3.4beta034 release --- Makefile.in | 18 ++++---- README | 2 +- TODO | 2 +- VERSION | 2 +- config.site | 2 +- configure | 32 +++++++++------ dist/newalpha | 2 +- dist/newversion | 2 +- dist/tiff.alpha | 2 +- dist/tiff.spec | 2 +- dist/tiff.version | 2 +- html/Makefile.in | 3 +- html/index.html | 4 +- html/v3.4beta034.html | 67 ++++++++++++++++++++++++++++++ libtiff/Makefile.in | 20 +++++---- libtiff/Makefile.lcc | 2 +- libtiff/mkg3states.c | 2 +- libtiff/mkspans.c | 2 +- libtiff/mkversion.c | 97 ++++++++------------------------------------ libtiff/t4.h | 2 +- libtiff/tif_acorn.c | 2 +- libtiff/tif_apple.c | 2 +- libtiff/tif_atari.c | 2 +- libtiff/tif_aux.c | 2 +- libtiff/tif_close.c | 2 +- libtiff/tif_codec.c | 2 +- libtiff/tif_compress.c | 2 +- libtiff/tif_dir.c | 2 +- libtiff/tif_dir.h | 2 +- libtiff/tif_dirinfo.c | 2 +- libtiff/tif_dirread.c | 2 +- libtiff/tif_dirwrite.c | 2 +- libtiff/tif_dumpmode.c | 2 +- libtiff/tif_error.c | 2 +- libtiff/tif_fax3.c | 2 +- libtiff/tif_fax3.h | 4 +- libtiff/tif_flush.c | 2 +- libtiff/tif_getimage.c | 2 +- libtiff/tif_jpeg.c | 2 +- libtiff/tif_lzw.c | 2 +- libtiff/tif_msdos.c | 2 +- libtiff/tif_next.c | 2 +- libtiff/tif_open.c | 2 +- libtiff/tif_packbits.c | 2 +- libtiff/tif_predict.c | 2 +- libtiff/tif_predict.h | 2 +- libtiff/tif_print.c | 2 +- libtiff/tif_read.c | 2 +- libtiff/tif_strip.c | 2 +- libtiff/tif_swab.c | 2 +- libtiff/tif_thunder.c | 2 +- libtiff/tif_tile.c | 2 +- libtiff/tif_unix.c | 2 +- libtiff/tif_version.c | 2 +- libtiff/tif_vms.c | 2 +- libtiff/tif_warning.c | 2 +- libtiff/tif_win3.c | 2 +- libtiff/tif_win32.c | 2 +- libtiff/tif_write.c | 2 +- libtiff/tif_zip.c | 2 +- libtiff/tiff.h | 22 +++++++++- libtiff/tiffcomp.h | 2 +- libtiff/tiffconf.h | 2 +- libtiff/tiffio.h | 2 +- libtiff/tiffiop.h | 2 +- man/Makefile.in | 2 +- man/TIFFClose.3t | 2 +- man/TIFFError.3t | 2 +- man/TIFFFlush.3t | 2 +- man/TIFFGetField.3t | 2 +- man/TIFFOpen.3t | 2 +- man/TIFFPrintDirectory.3t | 2 +- man/TIFFRGBAImage.3t | 2 +- man/TIFFReadDirectory.3t | 2 +- man/TIFFReadEncodedStrip.3t | 2 +- man/TIFFReadEncodedTile.3t | 2 +- man/TIFFReadRGBAImage.3t | 2 +- man/TIFFReadRawStrip.3t | 2 +- man/TIFFReadRawTile.3t | 2 +- man/TIFFReadScanline.3t | 2 +- man/TIFFReadTile.3t | 2 +- man/TIFFSetDirectory.3t | 2 +- man/TIFFSetField.3t | 2 +- man/TIFFWarning.3t | 2 +- man/TIFFWriteDirectory.3t | 2 +- man/TIFFWriteEncodedStrip.3t | 2 +- man/TIFFWriteEncodedTile.3t | 2 +- man/TIFFWriteRawStrip.3t | 2 +- man/TIFFWriteRawTile.3t | 2 +- man/TIFFWriteScanline.3t | 2 +- man/TIFFbuffer.3t | 2 +- man/TIFFcodec.3t | 2 +- man/TIFFmemory.3t | 2 +- man/TIFFquery.3t | 2 +- man/TIFFsize.3t | 2 +- man/TIFFstrip.3t | 2 +- man/TIFFswab.3t | 2 +- man/TIFFtile.3t | 2 +- man/fax2ps.1 | 2 +- man/fax2tiff.1 | 2 +- man/gif2tiff.1 | 2 +- man/libtiff.3t | 2 +- man/pal2rgb.1 | 2 +- man/ppm2tiff.1 | 2 +- man/ras2tiff.1 | 2 +- man/rgb2ycbcr.1 | 2 +- man/sgi2tiff.1 | 2 +- man/thumbnail.1 | 2 +- man/tiff2bw.1 | 2 +- man/tiff2ps.1 | 2 +- man/tiffcmp.1 | 2 +- man/tiffcp.1 | 2 +- man/tiffdither.1 | 2 +- man/tiffdump.1 | 2 +- man/tiffgt.1 | 2 +- man/tiffinfo.1 | 2 +- man/tiffmedian.1 | 2 +- man/tiffsplit.1 | 2 +- man/tiffsv.1 | 2 +- port/Makefile.in | 2 +- port/install.sh.in | 2 +- tools/Makefile.in | 47 +++++++++++---------- tools/Makefile.lcc | 2 +- tools/fax2ps.c | 2 +- tools/fax2tiff.c | 2 +- tools/gif2tiff.c | 2 +- tools/pal2rgb.c | 2 +- tools/ppm2tiff.c | 2 +- tools/ras2tiff.c | 2 +- tools/rasterfile.h | 2 +- tools/rgb2ycbcr.c | 2 +- tools/sgi2tiff.c | 2 +- tools/sgigt.c | 2 +- tools/sgisv.c | 2 +- tools/thumbnail.c | 2 +- tools/tiff2bw.c | 2 +- tools/tiff2ps.c | 2 +- tools/tiffcmp.c | 2 +- tools/tiffcp.c | 2 +- tools/tiffdither.c | 2 +- tools/tiffdump.c | 2 +- tools/tiffinfo.c | 2 +- tools/tiffmedian.c | 2 +- tools/tiffsplit.c | 2 +- 144 files changed, 312 insertions(+), 270 deletions(-) create mode 100644 html/v3.4beta034.html 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 \ diff --git a/README b/README index 67dd08ab..edeff123 100644 --- a/README +++ b/README @@ -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 -------------------------- diff --git a/TODO b/TODO index 47f6e5fc..3fd94828 100644 --- a/TODO +++ b/TODO @@ -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 diff --git a/VERSION b/VERSION index 2f4b6075..9e4de5cc 100644 --- a/VERSION +++ b/VERSION @@ -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 # diff --git a/configure b/configure index d73abcfa..9fe38292 100755 --- a/configure +++ b/configure @@ -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<>confsed< 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 Latest Release: v3.4
-Latest Software: v3.4
+Latest Software: v3.4beta034
Master FTP Site: ftp.sgi.com (192.48.153.1), directory graphics/tiff
Home Page: http://www-mipl.jpl.nasa.gov/~ndr/tiff/
@@ -81,7 +81,7 @@ the master FTP site listed above.
Sam Leffler / sam@engr.sgi.com. -Last updated: $Date: 1996/04/29 19:16:09 $ +Last updated: $Date: 1996/05/21 19:01:11 $
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 @@ + + + +Changes in TIFF v3.4beta034 + + + + + + +TIFF CHANGE INFORMATION + + + + +

+This document describes the changes made to the software between the +previous and current 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: +

+ +

+ +CHANGES IN THE SOFTWARE CONFIGURATION: + +
    +
  • support was added for building the library as a DSO under NetBSD +
  • a bug was fixed in the DSO support for Linux +
  • the handling of version strings has changed slightly to simplify parsing +
  • a new parameter, TIFFLIBREF, was added to control how the + library is referenced when linking programs in the tools directory +
+ +

+ +CHANGES IN LIBTIFF: + +
    +
  • DSO creation under Solaris now forces the DSO name with a -h option +
  • the interface to the mkversion program was changed + to eliminate the need to parse files +
  • a bug was fixed in the EOL-detection logic of the T.4/T.6 decoder +
  • ANSI IT8 TIFF/IT tag definitions were added to tiff.h +
+ + TIFF home page.
+ +
+ +
+Sam Leffler / sam@engr.sgi.com +Last updated $Date: 1996/05/21 18:57:37 $. +
+ + + 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] [] + * Syntax: mkversion major minor alpha type [outfile] */ #include #include #include -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