diff options
| author | Sam Leffler <sam@engr.sgi.com> | 1996-04-29 22:16:05 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@codelibre.net> | 2022-06-22 18:38:42 +0100 |
| commit | 901d6d6f2fb4fcde08a758a61f99de0a3fa6abaa (patch) | |
| tree | 72ef9c9551f19bb4db5b2abbb45b27601537fb91 /libtiff | |
| parent | c205122210e4b59a8501753601b74e68acf37f00 (diff) | |
| download | libtiff-git-901d6d6f2fb4fcde08a758a61f99de0a3fa6abaa.tar.gz | |
v3.4beta033 releasev3.4beta033
Note: VERSION is 3.4 and original release archive is named
tiff-v3.4-tar.gz but the actual content of the archive has
the changes for v3.4beta033 and the changes fit into the
sequence between v3.4beta032 and v3.4beta034.
Diffstat (limited to 'libtiff')
53 files changed, 79 insertions, 212 deletions
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index 2ea2c325..e58e1b71 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.33 1996/04/05 17:36:53 sam Exp $ +# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.in,v 1.34 1996/04/26 03:36:20 sam Rel $ # # Tag Image File Format Library # @@ -196,6 +196,9 @@ LINUXdso: ${OBJS} -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ touch $@ +# OSF/1 3.2 shared lib rule +OSFdso: ${OBJS} + ${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h diff --git a/libtiff/Makefile.lcc b/libtiff/Makefile.lcc index 46f8cbce..57603f12 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 Exp $ +# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.lcc,v 1.3 1996/01/10 19:32:51 sam Rel $ # # Tag Image File Format Library # diff --git a/libtiff/Makefile.msc b/libtiff/Makefile.msc deleted file mode 100644 index 16935189..00000000 --- a/libtiff/Makefile.msc +++ /dev/null @@ -1,151 +0,0 @@ -# $Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.msc,v 1.3 1996/01/10 19:32:51 sam Exp $ -# -# Tag Image File Format Library -# -# Copyright (c) 1988-1996 Sam Leffler -# Copyright (c) 1991-1996 Silicon Graphics, Inc. -# -# Permission to use, copy, modify, distribute, and sell this software and -# its documentation for any purpose is hereby granted without fee, provided -# that (i) the above copyright notices and this permission notice appear in -# all copies of the software and related documentation, and (ii) the names of -# Sam Leffler and Silicon Graphics may not be used in any advertising or -# publicity relating to the software without the specific, prior written -# permission of Sam Leffler and Silicon Graphics. -# -# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, -# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY -# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -# -# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR -# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF -# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE -# OF THIS SOFTWARE. -# -# This Makefile is for use with msc (7.0) using dmake. -# -DESTDIR=. -# -IPATH= -I. -I../jpeg -CONF_LIBRARY=\ - ${NULL} -COPTS= -Oxaz -AL -DBSDTYPES -Zi -Zd -CFLAGS= ${COPTS} ${IPATH} ${CONF_LIBRARY} -# -INCS= tiff.h tiffio.h -SRCS= tif_fax3.c \ - tif_fax4.c \ - tif_aux.c \ - tif_ccit.c \ - tif_clos.c \ - tif_comp.c \ - tif_dir.c \ - tif_diri.c \ - tif_dirr.c \ - tif_dirw.c \ - tif_dump.c \ - tif_erro.c \ - tif_geti.c \ - tif_jpeg.c \ - tif_flus.c \ - tif_lzw.c \ - tif_next.c \ - tif_open.c \ - tif_pack.c \ - tif_prin.c \ - tif_read.c \ - tif_swab.c \ - tif_stri.c \ - tif_thun.c \ - tif_tile.c \ - tif_unix.c \ - tif_vers.c \ - tif_warn.c \ - tif_writ.c \ - ${NULL} -OBJS= tif_fax3.obj \ - tif_fax4.obj \ - tif_aux.obj \ - tif_ccit.obj \ - tif_clos.obj \ - tif_comp.obj \ - tif_dir.obj \ - tif_diri.obj \ - tif_dirr.obj \ - tif_dirw.obj \ - tif_dump.obj \ - tif_erro.obj \ - tif_geti.obj \ - tif_jpeg.obj \ - tif_flus.obj \ - tif_lzw.obj \ - tif_msdo.obj \ - tif_next.obj \ - tif_open.obj \ - tif_pack.obj \ - tif_prin.obj \ - tif_read.obj \ - tif_stri.obj \ - tif_swab.obj \ - tif_thun.obj \ - tif_tile.obj \ - tif_vers.obj \ - tif_warn.obj \ - tif_writ.obj \ - ${NULL} -ALL= libtiff.lib - -all: ${ALL} - -%.obj : %.c - $(CC) $(CFLAGS) -c $*.c - -#.INCLUDE .IGNORE : depend - -${ALL}: ${OBJS} - lib libtiff /NOIGNO /NOLOGO -+tif_fax3.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_fax4.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_aux.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_ccit.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_clos.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_comp.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_dir.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_diri.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_dirr.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_dirw.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_dump.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_erro.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_geti.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_jpeg.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_flus.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_lzw.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_msdo.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_next.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_open.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_pack.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_prin.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_read.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_stri.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_swab.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_thun.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_tile.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_vers.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_warn.obj; - lib libtiff /NOIGNO /NOLOGO -+tif_writ.obj; - -${OBJS}: tiffio.h tiff.h tiffcomp.h tiffiop.h tiffconf.h -tif_fax3.obj: tif_fax3.c g3states.h t4.h tif_fax3.h - -g3states.h: mkg3states.c t4.h - ${CC} ${CFLAGS} mkg3states.c - mkg3states -c > g3states.h - -clean: - del *.obj - del mkg3stat - del g3states.h - -tags: ${SRCS} - ${CTAGS} ${SRCS} diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c index dc477afb..b627c621 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 Exp $ */ +/* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkg3states.c,v 1.34 1996/01/10 19:32:52 sam Rel $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/mkspans.c b/libtiff/mkspans.c index 6a4fe312..ae0cb189 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/mkspans.c,v 1.10 1996/01/10 19:32:53 sam Rel $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/mkversion.c b/libtiff/mkversion.c index 674ba87a..dda73268 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 Exp $ */ +/* "$Header: /usr/people/sam/tiff/libtiff/RCS/mkversion.c,v 1.4 1996/01/10 19:34:25 sam Rel $ */ /* * Copyright (c) 1995-1996 Sam Leffler diff --git a/libtiff/t4.h b/libtiff/t4.h index 30dc5aef..d35c9beb 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/t4.h,v 1.15 1996/01/10 19:33:20 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_acorn.c b/libtiff/tif_acorn.c index 40ce58dd..a5b25b7e 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_acorn.c,v 1.1 1995/09/06 00:24:10 sam Rel $ */ /* * Copyright (c) 1988-1995 Sam Leffler diff --git a/libtiff/tif_apple.c b/libtiff/tif_apple.c index 81f87724..2e67aef6 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_apple.c,v 1.22 1996/02/06 23:50:58 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_atari.c b/libtiff/tif_atari.c index 04966856..56cc0e7d 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 Exp $" */ +/* "$Header: /usr/people/sam/tiff/libtiff/RCS/tif_atari.c,v 1.5 1996/01/10 19:32:54 sam Rel $" */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c index debfd382..89eac282 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_aux.c,v 1.32 1996/01/10 19:32:55 sam Rel $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_close.c b/libtiff/tif_close.c index 8f416876..6f67f2c1 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_close.c,v 1.30 1996/01/10 19:32:55 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_codec.c b/libtiff/tif_codec.c index a821de14..e539c19a 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_codec.c,v 1.9 1996/04/05 17:36:53 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_compress.c b/libtiff/tif_compress.c index ce99489e..767ed22e 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_compress.c,v 1.51 1996/01/10 19:32:57 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 82187349..0193062e 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dir.c,v 1.156 1996/01/10 20:37:08 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h index c2021dfa..c0b55df9 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dir.h,v 1.4 1996/01/10 19:33:21 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c index ac221244..1f34e2e3 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirinfo.c,v 1.37 1996/01/10 19:32:58 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c index 6fd3a66b..42f61902 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirread.c,v 1.71 1996/03/29 16:35:17 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c index 964bce2d..d6d6d9b1 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.55 1996/04/09 17:13:34 sam Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dirwrite.c,v 1.56 1996/04/29 21:56:21 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler @@ -753,9 +753,9 @@ TIFFWriteAnyArray(TIFF* tif, w = (char*) _TIFFmalloc(n * tiffDataWidth[type]); switch (type) { case TIFF_BYTE: - { unsigned char* bp = (unsigned char*) w; + { uint8* bp = (uint8*) w; for (i = 0; i < n; i++) - bp[i] = (unsigned char) v[i]; + bp[i] = (uint8) v[i]; dir->tdir_tag = tag; dir->tdir_type = (short) type; dir->tdir_count = n; @@ -764,9 +764,9 @@ TIFFWriteAnyArray(TIFF* tif, } break; case TIFF_SBYTE: - { signed char* bp = (signed char*) w; + { int8* bp = (int8*) w; for (i = 0; i < n; i++) - bp[i] = (signed char) v[i]; + bp[i] = (int8) v[i]; dir->tdir_tag = tag; dir->tdir_type = (short) type; dir->tdir_count = n; diff --git a/libtiff/tif_dumpmode.c b/libtiff/tif_dumpmode.c index 08214652..94e4c39f 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_dumpmode.c,v 1.40 1996/01/10 19:33:00 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_error.c b/libtiff/tif_error.c index 35eb5f76..e0ea86c8 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_error.c,v 1.21 1996/01/10 19:33:01 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c index 2d5df7f0..51887ce4 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.c,v 1.135 1996/02/08 20:21:27 sam Rel $ */ /* * Copyright (c) 1990-1996 Sam Leffler diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h index 224d5e2c..9f7be320 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_fax3.h,v 1.29 1996/02/09 22:51:07 sam Rel $ */ /* * Copyright (c) 1990-1996 Sam Leffler diff --git a/libtiff/tif_flush.c b/libtiff/tif_flush.c index 5cf4c67f..fa510c52 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_flush.c,v 1.22 1996/01/10 19:33:03 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c index 92c1d1ba..699e2a72 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_getimage.c,v 1.39 1996/01/10 19:33:04 sam Rel $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c index c415fa64..a6874b0a 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_jpeg.c,v 1.25 1996/01/10 19:33:04 sam Rel $ */ /* * Copyright (c) 1994-1996 Sam Leffler diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c index d5eada58..cf9caf66 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_lzw.c,v 1.70 1996/01/10 19:33:05 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_msdos.c b/libtiff/tif_msdos.c index 5a44c8ae..fb2750b6 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_msdos.c,v 1.14 1996/01/10 19:33:06 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c index eb191c11..519192eb 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_next.c,v 1.27 1996/01/10 19:33:07 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_open.c b/libtiff/tif_open.c index 6ae2c130..d8ec72f2 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_open.c,v 1.63 1996/01/10 19:33:07 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_packbits.c b/libtiff/tif_packbits.c index 7a2e4452..dc3193c2 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_packbits.c,v 1.49 1996/01/10 19:33:08 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c index 1c9dee0c..c3df5b28 100644 --- a/libtiff/tif_pixarlog.c +++ b/libtiff/tif_pixarlog.c @@ -1187,23 +1187,23 @@ PixarLogVSetField(TIFF* tif, ttag_t tag, va_list ap) case PIXARLOGDATAFMT_8BIT: case PIXARLOGDATAFMT_8BITABGR: TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8); - TIFFSetField(tif, TIFFTAG_DATATYPE, SAMPLEFORMAT_UINT); + TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); break; case PIXARLOGDATAFMT_11BITLOG: TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16); - TIFFSetField(tif, TIFFTAG_DATATYPE, SAMPLEFORMAT_UINT); + TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); break; case PIXARLOGDATAFMT_12BITPICIO: TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16); - TIFFSetField(tif, TIFFTAG_DATATYPE, SAMPLEFORMAT_INT); + TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_INT); break; case PIXARLOGDATAFMT_16BIT: TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16); - TIFFSetField(tif, TIFFTAG_DATATYPE, SAMPLEFORMAT_UINT); + TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); break; case PIXARLOGDATAFMT_FLOAT: TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 32); - TIFFSetField(tif, TIFFTAG_DATATYPE, SAMPLEFORMAT_IEEEFP); + TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP); break; } result = 1; /* NB: pseudo tag */ diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c index 62a38179..556d599a 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_predict.c,v 1.4 1996/01/10 19:33:09 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_predict.h b/libtiff/tif_predict.h index 56a0ecdb..5ffb204d 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_predict.h,v 1.2 1996/01/10 19:33:22 sam Rel $ */ /* * Copyright (c) 1995-1996 Sam Leffler diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c index 5b919ecf..bd3f8a3f 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_print.c,v 1.67 1996/02/16 05:54:21 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c index ce78af1c..fa06279a 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_read.c,v 1.70 1996/01/10 19:33:11 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c index 4897c2b6..ebc7a669 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_strip.c,v 1.25 1996/01/10 19:33:11 sam Rel $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_swab.c b/libtiff/tif_swab.c index 5afb71d6..4abf560a 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_swab.c,v 1.22 1996/01/10 19:33:12 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_thunder.c b/libtiff/tif_thunder.c index fbc93c26..41b8ffa5 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_thunder.c,v 1.29 1996/01/10 19:33:13 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_tile.c b/libtiff/tif_tile.c index 64b89a84..8620ffef 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_tile.c,v 1.27 1996/01/10 19:33:14 sam Rel $ */ /* * Copyright (c) 1991-1996 Sam Leffler diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c index ae0f6bb8..d40ecccc 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_unix.c,v 1.16 1996/01/10 19:33:14 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_version.c b/libtiff/tif_version.c index 7ff3af08..8d4b39e9 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_version.c,v 1.16 1996/01/10 19:33:15 sam Rel $ */ /* * 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 aede7734..02b356e1 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_vms.c,v 1.21 1996/03/29 16:37:53 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_warning.c b/libtiff/tif_warning.c index 7ec97cbe..0f7f58d9 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_warning.c,v 1.21 1996/01/10 19:33:17 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_win3.c b/libtiff/tif_win3.c index 16e24781..a29f3ad1 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_win3.c,v 1.6 1996/01/10 19:33:17 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c index ea5e6996..1e7f4776 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_win32.c,v 1.3 1996/01/10 19:33:18 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_write.c b/libtiff/tif_write.c index c5b64d22..e987a342 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_write.c,v 1.72 1996/01/10 19:33:19 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c index 84d2c8e3..8bdaaf40 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tif_zip.c,v 1.8 1996/03/07 17:00:23 sam Rel $ */ /* * Copyright (c) 1995-1996 Sam Leffler diff --git a/libtiff/tiff.h b/libtiff/tiff.h index 98d4ad38..d6e146e7 100644 --- a/libtiff/tiff.h +++ b/libtiff/tiff.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiff.h,v 1.68 1996/04/05 17:36:53 sam Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiff.h,v 1.71 1996/04/29 22:16:05 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler @@ -52,7 +52,11 @@ * 32-bit quantities int32/uint32 * strings unsigned char* */ +#ifdef __STDC__ typedef signed char int8; /* NB: non-ANSI compilers may not grok */ +#else +typedef char int8; +#endif typedef unsigned char uint8; typedef short int16; typedef unsigned short uint16; /* sizeof (uint16) must == 2 */ @@ -150,6 +154,8 @@ typedef enum { #define COMPRESSION_PIXARFILM 32908 /* Pixar companded 10bit LZW */ #define COMPRESSION_PIXARLOG 32909 /* Pixar companded 11bit ZIP */ #define COMPRESSION_DEFLATE 32946 /* Deflate compression */ +/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */ +#define COMPRESSION_DCS 32947 /* Kodak DCS encoding */ #define COMPRESSION_JBIG 34661 /* ISO JBIG */ #define TIFFTAG_PHOTOMETRIC 262 /* photometric interpretation */ #define PHOTOMETRIC_MINISWHITE 0 /* min value is white */ @@ -351,7 +357,7 @@ typedef enum { #define PIXARLOGDATAFMT_12BITPICIO 3 /* as per PICIO (1.0==2048) */ #define PIXARLOGDATAFMT_16BIT 4 /* signed short samples */ #define PIXARLOGDATAFMT_FLOAT 5 /* IEEE float samples */ -/* 65550-65556 are allocated to Ken Murchison <ken@oceana.com> */ +/* 65550-65556 are allocated to Oceana Matrix <dev@oceana.com> */ #define TIFFTAG_DCSIMAGERTYPE 65550 /* imager model & filter */ #define DCSIMAGERMODEL_M3 0 /* M3 chip (1280 x 1024) */ #define DCSIMAGERMODEL_M5 1 /* M5 chip (1536 x 1024) */ diff --git a/libtiff/tiffcomp.h b/libtiff/tiffcomp.h index c208c9ac..516e6384 100644 --- a/libtiff/tiffcomp.h +++ b/libtiff/tiffcomp.h @@ -1,4 +1,4 @@ -/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffcomp.h,v 1.48 1996/02/06 23:50:58 sam Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffcomp.h,v 1.49 1996/04/29 21:56:21 sam Rel $ */ /* * Copyright (c) 1990-1996 Sam Leffler @@ -202,4 +202,13 @@ extern int creat(const char *path, int mode); #endif /* __cplusplus */ #endif /* __acornriscos */ +/* Bit and byte order, the default is MSB to LSB */ +#ifdef VMS +#undef HOST_FILLORDER +#undef HOST_BIGENDIAN +#define HOST_FILLORDER FILLORDER_LSB2MSB +#define HOST_BIGENDIAN 0 +#endif + + #endif /* _COMPAT_ */ diff --git a/libtiff/tiffconf.h b/libtiff/tiffconf.h index 13f1ccde..1bb9d868 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffconf.h,v 1.13 1996/04/05 17:36:53 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler * Copyright (c) 1991-1996 Silicon Graphics, Inc. diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h index e4a8d4ea..2c1e16ff 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffio.h,v 1.93 1996/03/07 17:00:14 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index 6412898a..e4ffc59b 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 Exp $ */ +/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffiop.h,v 1.80 1996/04/05 17:36:53 sam Rel $ */ /* * Copyright (c) 1988-1996 Sam Leffler |