diff --git a/ChangeLog b/ChangeLog index 35051ef3..47a95fe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-12-21 Bob Friesenhahn + + * libtiff 4.0.0 released. + 2011-12-08 Frank Warmerdam * libtiff/tif_dirread.c, libtiff/tif_read.c: more cautious checking diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE index bc90e943..5752cc44 100644 --- a/HOWTO-RELEASE +++ b/HOWTO-RELEASE @@ -49,7 +49,7 @@ Notes on releasing. 6. Add an entry to Changelog similar to: - * libtiff 4.0.0beta7 released. + * libtiff 4.0.0 released. 7. In the source tree do @@ -99,7 +99,7 @@ Notes on releasing. 13. In the source tree do - cvs tag Release-v4-0-0beta7 + cvs tag Release-v4-0-0 (or the appropriate name for the release) diff --git a/RELEASE-DATE b/RELEASE-DATE index 4181d6f7..cffd6cde 100644 --- a/RELEASE-DATE +++ b/RELEASE-DATE @@ -1 +1 @@ -20110409 +20111221 diff --git a/VERSION b/VERSION index 2956a5b1..fcdb2e10 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0beta7 +4.0.0 diff --git a/configure b/configure index 56de3f32..98a11462 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.68 for LibTIFF Software 4.0.0beta7. +# Generated by GNU Autoconf 2.68 for LibTIFF Software 4.0.0. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='LibTIFF Software' PACKAGE_TARNAME='tiff' -PACKAGE_VERSION='4.0.0beta7' -PACKAGE_STRING='LibTIFF Software 4.0.0beta7' +PACKAGE_VERSION='4.0.0' +PACKAGE_STRING='LibTIFF Software 4.0.0' PACKAGE_BUGREPORT='tiff@lists.maptools.org' PACKAGE_URL='' @@ -1373,7 +1373,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 4.0.0beta7 to adapt to many kinds of systems. +\`configure' configures LibTIFF Software 4.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1447,7 +1447,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibTIFF Software 4.0.0beta7:";; + short | recursive ) echo "Configuration of LibTIFF Software 4.0.0:";; esac cat <<\_ACEOF @@ -1621,7 +1621,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LibTIFF Software configure 4.0.0beta7 +LibTIFF Software configure 4.0.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2343,7 +2343,7 @@ cat >config.log <<_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 4.0.0beta7, which was +It was created by LibTIFF Software $as_me 4.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3238,7 +3238,7 @@ fi # Define the identity of the package. PACKAGE='tiff' - VERSION='4.0.0beta7' + VERSION='4.0.0' cat >>confdefs.h <<_ACEOF @@ -3305,12 +3305,12 @@ fi LIBTIFF_MAJOR_VERSION=4 LIBTIFF_MINOR_VERSION=0 LIBTIFF_MICRO_VERSION=0 -LIBTIFF_ALPHA_VERSION=beta7 +LIBTIFF_ALPHA_VERSION= LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"` LIBTIFF_CURRENT=5 -LIBTIFF_REVISION=4 +LIBTIFF_REVISION=5 LIBTIFF_AGE=0 LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE @@ -20344,7 +20344,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibTIFF Software $as_me 4.0.0beta7, which was +This file was extended by LibTIFF Software $as_me 4.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20410,7 +20410,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LibTIFF Software config.status 4.0.0beta7 +LibTIFF Software config.status 4.0.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 76d684ca..fa23704f 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.64) -AC_INIT([LibTIFF Software],[4.0.0beta7],[tiff@lists.maptools.org],[tiff]) +AC_INIT([LibTIFF Software],[4.0.0],[tiff@lists.maptools.org],[tiff]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(m4) AC_LANG(C) @@ -42,7 +42,7 @@ dnl Don't fill the ALPHA_VERSION field, if not applicable. LIBTIFF_MAJOR_VERSION=4 LIBTIFF_MINOR_VERSION=0 LIBTIFF_MICRO_VERSION=0 -LIBTIFF_ALPHA_VERSION=beta7 +LIBTIFF_ALPHA_VERSION= 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"` @@ -77,7 +77,7 @@ dnl increment age. dnl 6. If any interfaces have been removed since the last public release, dnl then set age to 0. LIBTIFF_CURRENT=5 -LIBTIFF_REVISION=4 +LIBTIFF_REVISION=5 LIBTIFF_AGE=0 LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE diff --git a/html/index.html b/html/index.html index 843d2339..dad41e29 100644 --- a/html/index.html +++ b/html/index.html @@ -24,11 +24,7 @@ Latest Stable Release - v3.9.5 - - - Latest Development Release - v4.0.0beta7 + v4.0.0 Master Download Site @@ -51,10 +47,10 @@ export CVSROOT=:pserver:cvsanon@cvs.maptools.org:/cvs/maptools/cvsroot
cvs login
(use empty password)
- cvs checkout -r branch-3-9 libtiff
 - to get stable libtiff branch, or
- cvs checkout libtiff
- to get bleeding edge development version of libtiff from CVS HEAD. + cvs checkout libtiff
 + to get the stable libtiff code or
+ cvs checkout -r branch-3-9 libtiff
+ to get the previous stable branch supporting the 3.9.X release series.
@@ -121,7 +117,7 @@

- Last updated $Date: 2011-04-09 21:07:41 $. + Last updated $Date: 2011-12-22 00:29:29 $.

diff --git a/libtiff/tif_lzma.c b/libtiff/tif_lzma.c index c176a505..dedf1d94 100644 --- a/libtiff/tif_lzma.c +++ b/libtiff/tif_lzma.c @@ -1,4 +1,4 @@ -/* $Id: tif_lzma.c,v 1.3 2011-02-22 21:55:13 fwarmerdam Exp $ */ +/* $Id: tif_lzma.c,v 1.4 2011-12-22 00:29:29 bfriesen Exp $ */ /* * Copyright (c) 2010, Andrey Kiselev @@ -220,7 +220,7 @@ LZMADecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) return 0; } - tif->tif_rawcp = sp->stream.next_in; + tif->tif_rawcp = (uint8 *)sp->stream.next_in; /* cast away const */ tif->tif_rawcc = sp->stream.avail_in; return 1; diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h index 44ed853c..b10177ee 100644 --- a/libtiff/tiffvers.h +++ b/libtiff/tiffvers.h @@ -1,4 +1,4 @@ -#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.0beta7\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.0\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 20110409 +#define TIFFLIB_VERSION 20111221