From 9f33c698e0122e80e73e94950c09c519eeec97f7 Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Sat, 2 Oct 2004 13:54:50 +0000 Subject: [PATCH] libtiff 3.7.0beta2 released. --- ChangeLog | 11 +++ RELEASE-DATE | 2 +- VERSION | 2 +- configure | 25 +++---- configure.ac | 6 +- contrib/dbs/xtiff/Makefile.in | 2 +- html/Makefile.am | 5 +- html/Makefile.in | 5 +- html/images/Makefile.in | 2 +- html/index.html | 4 +- html/man/Makefile.in | 2 +- html/v3.7.0beta2.html | 131 ++++++++++++++++++++++++++++++++++ libtiff/Makefile.in | 4 +- libtiff/tiffvers.h | 4 +- test/Makefile.in | 25 +++---- 15 files changed, 186 insertions(+), 44 deletions(-) create mode 100644 html/v3.7.0beta2.html diff --git a/ChangeLog b/ChangeLog index 3993826c..d9e92b26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-10-02 Andrey Kiselev + + * libtiff 3.7.0beta2 released. + + * libtiff/{tif_aux.c, tif_compress.c, tif_dirinfo.c, tif_dirwrite.c, + tif_extension.c, tif_fax3.c, tif_luv.c, tif_packbits.c, + tif_pixarlog.c, tif_write.c}: Added checks for failed memory + allocations and integer overflows (Dmitry V. Levin). + + * libtiff/tiff.h: Missed TIFF_BIGTIFF_VERSION constant added. + 2004-10-01 Frank Warmerdam * libtiff/tif_open.c: added a more informative message if a BigTIFF diff --git a/RELEASE-DATE b/RELEASE-DATE index 9a876dec..d201c792 100644 --- a/RELEASE-DATE +++ b/RELEASE-DATE @@ -1 +1 @@ -20040919 +20041002 diff --git a/VERSION b/VERSION index 594c061f..dddd57ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.0beta +3.7.0beta2 diff --git a/configure b/configure index 6a0e26c7..53043a91 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for LibTIFF Software 3.7.0beta. +# Generated by GNU Autoconf 2.59 for LibTIFF Software 3.7.0beta2. # # Report bugs to . # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='LibTIFF Software' PACKAGE_TARNAME='tiff' -PACKAGE_VERSION='3.7.0beta' -PACKAGE_STRING='LibTIFF Software 3.7.0beta' +PACKAGE_VERSION='3.7.0beta2' +PACKAGE_STRING='LibTIFF Software 3.7.0beta2' PACKAGE_BUGREPORT='tiff@remotesensing.org' # Factoring default headers for most tests. @@ -953,7 +953,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LibTIFF Software 3.7.0beta to adapt to many kinds of systems. +\`configure' configures LibTIFF Software 3.7.0beta2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1024,7 +1024,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibTIFF Software 3.7.0beta:";; + short | recursive ) echo "Configuration of LibTIFF Software 3.7.0beta2:";; esac cat <<\_ACEOF @@ -1203,7 +1203,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -LibTIFF Software configure 3.7.0beta +LibTIFF Software configure 3.7.0beta2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1217,7 +1217,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibTIFF Software $as_me 3.7.0beta, which was +It was created by LibTIFF Software $as_me 3.7.0beta2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1950,7 +1950,7 @@ fi # Define the identity of the package. PACKAGE='tiff' - VERSION='3.7.0beta' + VERSION='3.7.0beta2' cat >>confdefs.h <<_ACEOF @@ -3309,7 +3309,7 @@ fi LIBTIFF_MAJOR_VERSION=3 LIBTIFF_MINOR_VERSION=7 LIBTIFF_MICRO_VERSION=0 -LIBTIFF_ALPHA_VERSION=beta +LIBTIFF_ALPHA_VERSION=beta2 LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` @@ -20277,7 +20277,8 @@ esac -for ac_header in fcntl.h limits.h malloc.h sys/time.h unistd.h + +for ac_header in assert.h fcntl.h limits.h malloc.h sys/time.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -26485,7 +26486,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by LibTIFF Software $as_me 3.7.0beta, which was +This file was extended by LibTIFF Software $as_me 3.7.0beta2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26548,7 +26549,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -LibTIFF Software config.status 3.7.0beta +LibTIFF Software config.status 3.7.0beta2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 2111eedb..477ef9af 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ dnl OF THIS SOFTWARE. dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([LibTIFF Software], 3.7.0beta, [tiff@remotesensing.org], tiff) +AC_INIT([LibTIFF Software], 3.7.0beta2, [tiff@remotesensing.org], tiff) AC_LANG(C) dnl Compute the canonical target-system type variable @@ -41,7 +41,7 @@ dnl Don't fill the ALPHA_VERSION field, if not applicable. LIBTIFF_MAJOR_VERSION=3 LIBTIFF_MINOR_VERSION=7 LIBTIFF_MICRO_VERSION=0 -LIBTIFF_ALPHA_VERSION=beta +LIBTIFF_ALPHA_VERSION=beta2 LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION dnl This will be used with the 'make release' target LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` @@ -76,7 +76,7 @@ case "$target_os" in esac dnl Checks for header files. -AC_CHECK_HEADERS([fcntl.h limits.h malloc.h sys/time.h unistd.h]) +AC_CHECK_HEADERS([assert.h fcntl.h limits.h malloc.h sys/time.h unistd.h]) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in index 95a40176..4831ab08 100644 --- a/contrib/dbs/xtiff/Makefile.in +++ b/contrib/dbs/xtiff/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.6 2004-09-19 10:44:19 dron Exp $ +# $Id: Makefile.in,v 1.7 2004-10-02 13:54:51 dron Exp $ # # Tag Image File Format (TIFF) Software # diff --git a/html/Makefile.am b/html/Makefile.am index 727da987..7b627631 100644 --- a/html/Makefile.am +++ b/html/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.4 2004-09-19 10:44:19 dron Exp $ +# $Id: Makefile.am,v 1.5 2004-10-02 13:54:51 dron Exp $ # # Tag Image File Format (TIFF) Software # @@ -62,7 +62,8 @@ EXTRA_DIST = \ v3.6.0.html \ v3.6.1.html \ v3.7.0alpha.html \ - v3.7.0beta.html + v3.7.0beta.html \ + v3.7.0beta2.html SUBDIRS = images man diff --git a/html/Makefile.in b/html/Makefile.in index 0a32f5db..8296878b 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.17 2004-09-19 10:44:19 dron Exp $ +# $Id: Makefile.in,v 1.18 2004-10-02 13:54:51 dron Exp $ # # Tag Image File Format (TIFF) Software # @@ -248,7 +248,8 @@ EXTRA_DIST = \ v3.6.0.html \ v3.6.1.html \ v3.7.0alpha.html \ - v3.7.0beta.html + v3.7.0beta.html \ + v3.7.0beta2.html SUBDIRS = images man all: all-recursive diff --git a/html/images/Makefile.in b/html/images/Makefile.in index 26c7f20d..cd0afa9e 100644 --- a/html/images/Makefile.in +++ b/html/images/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.6 2004-09-19 10:44:19 dron Exp $ +# $Id: Makefile.in,v 1.7 2004-10-02 13:54:51 dron Exp $ # # Tag Image File Format (TIFF) Software # diff --git a/html/index.html b/html/index.html index e5f8d8c7..815a6f87 100644 --- a/html/index.html +++ b/html/index.html @@ -18,7 +18,7 @@ http://libtiff.maptools.org/ Latest Stable Release: v3.6.1
-Latest Development Release: v3.7.0beta
+Latest Development Release: v3.7.0beta2
Master Download Site: ftp.remotesensing.org , directory pub/libtiff
@@ -93,7 +93,7 @@ and Adding New Tags


-Last updated $Date: 2004-09-19 10:44:19 $. +Last updated $Date: 2004-10-02 13:54:51 $. diff --git a/html/man/Makefile.in b/html/man/Makefile.in index 749ecb54..5598ec58 100644 --- a/html/man/Makefile.in +++ b/html/man/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.6 2004-09-19 10:44:19 dron Exp $ +# $Id: Makefile.in,v 1.7 2004-10-02 13:54:51 dron Exp $ # # Tag Image File Format (TIFF) Software # diff --git a/html/v3.7.0beta2.html b/html/v3.7.0beta2.html new file mode 100644 index 00000000..9e301283 --- /dev/null +++ b/html/v3.7.0beta2.html @@ -0,0 +1,131 @@ + + + + Changes in TIFF v3.7.0beta2 + + + + + + + + +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: +

+

+


+ + + +MAJOR CHANGES: + +
    + +
  • The code has been reviewed by Dmitry Levin: added checks + for values, returned by the space allocation functions, fixed + problems with the possible integer overflows. + +
+ + +


+ + +CHANGES IN THE SOFTWARE CONFIGURATION: + +
    +
  • Several fixes in the test suite. +
+ +


+ + + +CHANGES IN LIBTIFF: + +
    + +
  • Preliminary support for BigTIFF files: now libtiff can + recognize and reject to open such images. ;-) + +
  • libtiff/tif_dirinfo.c: changed type of XMLPacket (tag 700) to + TIFFTAG_BYTE instead of TIFFTAG_UNDEFINED to comply with the info + in the Adobe XMP Specification. + +
  • Added many checks for integer overflow and for successful space + allocations in the different parts of library. Code review + completed by Dmitry V. Levin. + +
  • libtiff/{tiffio.h, tif_compress.c}: Added + TIFFGetConfiguredCODECs()function to get the list of configured codecs. + +
+ +


+ + + +CHANGES IN THE TOOLS: + +
    +
  • tiff2bw: Write ImageWidth/Height tags to output file, as + noted by Gennady Khokhorin. + +
+ +


+ + + +CHANGES IN THE CONTRIB AREA: + +
    + +
  • No changes. + +
+ + + +CHANGES IN THE LZW COMPRESSION +KIT: +
    + +
  • This one is not longer needed. + +
+ + TIFF home page.
+ +
+ +Last updated $Date: 2004-10-02 13:54:51 $. + + + diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index a3a05975..427aa1c5 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -342,9 +342,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/fi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libtiff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libtiff/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu libtiff/Makefile + $(AUTOMAKE) --foreign libtiff/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h index 4e3effd5..f9a50583 100644 --- a/libtiff/tiffvers.h +++ b/libtiff/tiffvers.h @@ -1,4 +1,4 @@ -#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.7.0beta\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.7.0beta2\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." /* * This define can be used in code that requires * compilation-related definitions specific to a @@ -6,4 +6,4 @@ * version checking should be done based on the * string returned by TIFFGetVersion. */ -#define TIFFLIB_VERSION 20040919 +#define TIFFLIB_VERSION 20041002 diff --git a/test/Makefile.in b/test/Makefile.in index 6477e966..950ea430 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.5 from Makefile.am. +# Makefile.in generated by automake 1.9.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -60,7 +60,9 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ check_PROGRAMS = ascii_tag$(EXEEXT) long_tag$(EXEEXT) \ short_tag$(EXEEXT) strip_rw$(EXEEXT) subdir = test @@ -90,17 +92,13 @@ strip_rw_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/libtiff -I$(top_builddir)/libtiff depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ascii_tag.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/check_tag.Po ./$(DEPDIR)/long_tag.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/short_tag.Po ./$(DEPDIR)/strip_rw.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/test_arrays.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(ascii_tag_SOURCES) $(long_tag_SOURCES) \ $(short_tag_SOURCES) $(strip_rw_SOURCES) @@ -200,6 +198,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -315,24 +315,21 @@ distclean-compile: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: @@ -518,7 +515,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use"