* libtiff 3.9.0 released.v3.9.0Release-v3-9-0

20 files changed, 304 insertions, 230 deletions

diff --git a/ChangeLog b/ChangeLog
index e6ab6597..806176f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-08-20  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+	* libtiff 3.9.0 released.
+
 	* libtiff/tif_print.c (TIFFPrintDirectory): Applied patch for "tag
 	error may cause segfault in tif_print.c."
 	http://bugzilla.maptools.org/show_bug.cgi?id=1896
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 2fd04d28..23aae5a5 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -24,7 +24,7 @@ utilities to release a package.
    Version should be updated in two places: in the second argument of the
    AC_INIT macro and in LIBTIFF_xxx_VERSION variables.
 
-5. autoconf
+5. ./autogen.sh
 
 6. sh configure
 
@@ -47,10 +47,11 @@ utilities to release a package.
     be created in the top level package directory.
 
 14. Copy to ftp.remotesensing.org ftp site. 
-    scp tiff-*.tar.gz ftp.remotesensing.org:/var/ftp/libtiff/
-    scp tiff-*.zip ftp.remotesensing.org:/var/ftp/libtiff/
+    scp tiff-*.tar.gz tiff-*.zip \
+    	frankw@upload.osgeo.org:/osgeo/download/libtiff
 
 15. Announce to list, tiff@lists.maptools.org
 
 16. Update libtiff page on freshmeat with new version announcement.
 
+
diff --git a/Makefile.am b/Makefile.am
index a799dff7..b12b40af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ dist_doc_DATA = $(docfiles)
 SUBDIRS = port libtiff tools build contrib test man html
 
 release:
-	(rm -f RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > RELEASE-DATE)
-	(rm -f VERSION && echo $(LIBTIFF_VERSION) > VERSION)
-	(rm -f ./libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' ./libtiff/tiffvers.h.in > ./libtiff/tiffvers.h)
+	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
+	(rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION)
+	(rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)
 
diff --git a/Makefile.in b/Makefile.in
index 8e9b06c7..ed2821ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -834,9 +834,9 @@ uninstall-am: uninstall-dist_docDATA
 
 
 release:
-	(rm -f RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > RELEASE-DATE)
-	(rm -f VERSION && echo $(LIBTIFF_VERSION) > VERSION)
-	(rm -f ./libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' ./libtiff/tiffvers.h.in > ./libtiff/tiffvers.h)
+	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
+	(rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION)
+	(rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/RELEASE-DATE b/RELEASE-DATE
index 1b3f7479..8c14d22f 100644
--- a/RELEASE-DATE
+++ b/RELEASE-DATE
@@ -1 +1 @@
-20070713
+20090820
diff --git a/VERSION b/VERSION
index 53dfe932..a5c4c763 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.9.0beta
+3.9.0
diff --git a/build/Makefile.in b/build/Makefile.in
index 1200c15c..ca630b9d 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -15,7 +15,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.1.2.7 2009-08-20 20:23:52 bfriesen Exp $
+# $Id: Makefile.in,v 1.1.2.8 2009-08-20 22:31:00 bfriesen Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
diff --git a/configure b/configure
index df461d6a..76887024 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.64 for LibTIFF Software 3.9.0beta.
+# Generated by GNU Autoconf 2.64 for LibTIFF Software 3.9.0.
 #
 # Report bugs to <tiff@lists.maptools.org>.
 #
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LibTIFF Software'
 PACKAGE_TARNAME='tiff'
-PACKAGE_VERSION='3.9.0beta'
-PACKAGE_STRING='LibTIFF Software 3.9.0beta'
+PACKAGE_VERSION='3.9.0'
+PACKAGE_STRING='LibTIFF Software 3.9.0'
 PACKAGE_BUGREPORT='tiff@lists.maptools.org'
 PACKAGE_URL=''
 
@@ -1492,7 +1492,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.9.0beta to adapt to many kinds of systems.
+\`configure' configures LibTIFF Software 3.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1567,7 +1567,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LibTIFF Software 3.9.0beta:";;
+     short | recursive ) echo "Configuration of LibTIFF Software 3.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1725,7 +1725,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LibTIFF Software configure 3.9.0beta
+LibTIFF Software configure 3.9.0
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2449,7 +2449,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 3.9.0beta, which was
+It was created by LibTIFF Software $as_me 3.9.0, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -3376,7 +3376,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tiff'
- VERSION='3.9.0beta'
+ VERSION='3.9.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3443,7 +3443,7 @@ fi
 LIBTIFF_MAJOR_VERSION=3
 LIBTIFF_MINOR_VERSION=9
 LIBTIFF_MICRO_VERSION=0
-LIBTIFF_ALPHA_VERSION=beta
+LIBTIFF_ALPHA_VERSION=
 LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
 LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
 
@@ -19062,7 +19062,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 3.9.0beta, which was
+This file was extended by LibTIFF Software $as_me 3.9.0, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19126,7 +19126,7 @@ Report bugs to <tiff@lists.maptools.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-LibTIFF Software config.status 3.9.0beta
+LibTIFF Software config.status 3.9.0
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 8cfd959a..28639a3e 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],[3.9.0beta],[tiff@lists.maptools.org],[tiff])
+AC_INIT([LibTIFF Software],[3.9.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=3
 LIBTIFF_MINOR_VERSION=9
 LIBTIFF_MICRO_VERSION=0
-LIBTIFF_ALPHA_VERSION=beta
+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"`
diff --git a/configure.com b/configure.com
index 42676e80..6a5d8b5f 100644
--- a/configure.com
+++ b/configure.com
@@ -1,4 +1,4 @@
-$! $Id: configure.com,v 1.1.2.1 2007-11-23 09:12:35 dron Exp $
+$! $Id: configure.com,v 1.1.2.2 2009-08-20 22:31:00 bfriesen Exp $
 $!
 $! OpenVMS configure procedure for libtiff
 $! (c) Alexey Chupahin  22-NOV-2007
@@ -1314,7 +1314,7 @@ $COPY SYS$INPUT 'CURRENT'TIF_CONFIG.H
 #define PACKAGE_NAME "LibTIFF Software"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LibTIFF Software 3.9.0beta for VMS"
+#define PACKAGE_STRING "LibTIFF Software 3.9.0 for VMS"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "tiff"
diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in
index b6e2e8ec..a67e227a 100644
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@@ -15,7 +15,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.36.2.7 2009-08-20 20:23:52 bfriesen Exp $
+# $Id: Makefile.in,v 1.36.2.8 2009-08-20 22:31:00 bfriesen Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
diff --git a/html/BigTIFFProposal.html b/html/BigTIFFProposal.html
deleted file mode 100644
index c64909f2..00000000
--- a/html/BigTIFFProposal.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
-<head>
-  <title>Proposal to Implement BigTIFF Support in LibTiff</title>
-</head>
-<body>
-  <h1>Proposal to Implement BigTIFF Support in LibTiff</h1>
-  <p><b>NEWS:</b> We have located all four required sponsors. There are no more 
-    open slots. We will issue appropriate press release shortly.</p>
-  <h2>0. Summary</h2>
-  <p>BigTIFF logically extends the original TIFF file format (referred to as 
-    'ClassicTIFF' from this point on), breaking the 4 gigabyte boundary, in theory 
-    allowing files up to 18,000 petabytes in size. The BigTIFF specification is the 
-    result of work by a variety of parties on the LibTiff mailing list, including 
-    the current LibTiff maintainers, Joris Van Damme and Adobe staff. The BigTIFF 
-    specification has not yet been officially approved by the TIFF specification 
-    owner (Adobe) but implementation within LibTiff could accelerate that 
-    process.</p>
-  <p>For more information on the BigTIFF file format, we recommend 
-    <a href="http://www.awaresystems.be/imaging/tiff/bigtiff.html">AWare Systems' 
-    BigTIFF page.</a></p>
-  <p>BigTIFF is expected to be especially useful for people and vendors that are 
-    confronted with unusually large images, and still seek to use an open, simple, 
-    and extendable format. This requirement is frequently seen in the geospatial 
-    field, but also affects large format scanners, medical imaging and other 
-    fields.</p>
-  <h2>1. Sponsoring</h2>
-  <p>It is planned that LibTiff 4.0, the BigTIFF upgrade to LibTiff, would start 
-    March 1, 2007. A preliminary version (LibTiff 4.0alpha1) will be operational by 
-    June 15, 2007. Testing and final release improvements for LibTiff 4.0 will be 
-    completed by July 30, 2007.</p>
-  <p>The LibTiff BigTIFF upgrade team is seeking USD 24,000 from four sponsors (USD 
-    6,000 each) to fund the project. Sponsorship payment will be invoiced upon 
-    delivery of the LibTiff 4.0alpha1 release (on or before June 15) with a 30 day 
-    payable, giving time for some technical review.</p>
-  <p>In addition to the benefits of open interchange of BigTIFF data that comes from 
-    support in a public and free open source codec, sponsors will be given proper 
-    public acknowledgment. During development, they will be mentioned in the 
-    appropriate sections of the LibTiff and AWare Systems site.</p>
-  <p>When LibTiff 4.0 with BigTIFF support is released, they will additionally 
-    receive public acknowledgment in a formal press release, distributed widely to 
-    news venues in the imaging and geospatial industries.</p>
-  <p>A 'migration guide' document or any functional equivalent thereof will be 
-    included in the standard free distribution, but sponsors will additionally 
-    receive up to 20 hours of consulting and support on any BigTIFF migration issues 
-    that they may be facing, and/or any additional related requests they may have.</p>
-  <h2>2. Development and Testing</h2>
-  <p>The work will primarily be done by Joris Van Damme on behalf of his company 
-    AWare Systems. Joris was closely involved in the drafting of the BigTIFF file 
-    format proposal, and has also developed the proprietary AWare Systems TIFF 
-    codec that already supports BigTIFF. Joris Van Damme has a deep understanding 
-    of the TIFF format, and has been acting as a LibTiff co-maintainer for over a 
-    year, contributing the upgraded OJPEG codec as well as several other 
-    improvements.</p>
-  <p>Joris and AWare Systems have agreed to crosstest their proprietary codec and 
-    LibTiff's support for BigTIFF extensively. Joris will also extend the test image 
-    library included with LibTiff, with a number of varying BigTIFF test files. 
-    These files will primarily include test files with issues that relate closely 
-    to the BigTIFF file format and the difference with ClassicTIFF. For instance, 
-    in BigTIFF the datatypes TIFF_LONG, TIFF_LONG8, TIFF_IFD and TIFF_IFD8 are all 
-    valid for tags pointing to additional IFDs, and thus files will be included to 
-    illustrate and enable testing all of these. Additionally, Joris will build a 
-    tool to enable creating test files that exceed 4 gigabyte, as these can of 
-    course not be included in the test suite in a more direct manner, and a tool to 
-    convert files from ClassicTIFF to BigTIFF, as well as the other way around for 
-    source BigTIFF files that do not exceed 4 gigabyte in size.</p>
-  <p>Frank Warmerdam has also agreed to be involved in a consulting and validation 
-    role. Frank has been LibTiff's primary maintainer since approximately the year 
-    2000, develops large-image exploitation software for the geospatial industry 
-    (GDAL) and is currently President of the Open Source Geospatial Foundation 
-    (OSGeo). Frank will also be ensuring that BigTIFF improvements are made 
-    accessible to all users of the GDAL library.</p>
-  <h2>3. Implementation Strategy</h2>
-  <p>Many people who have a need for BigTIFF, use LibTiff already. We thus plan to 
-    support BigTIFF in LibTiff, applying a minimum change strategy much like the 
-    one that was applied in the creation of the new file format in the first 
-    place.</p>
-  <p>To support BigTIFF, we will use a 64bit integer datatype. It is anticipated 
-    that some older platforms will not be able to comply with this need, and for 
-    that reason we will encapsulate all required changes inside a conditional 
-    compilation switch.</p>
-  <p>While it is anticipated that there will be ABI (application binary interface) 
-    changes as part of a BigTIFF support upgrade to LibTiff, and possibly some 
-    more to support other major upgrades to LibTiff, the plan is such that 
-    the source level API will remain compatible for most LibTiff applications. 
-    Applications using specialized interfaces may require some minor source code 
-    changes, but we will provide backwards compatibility to support the majority
-    of existing application level code.</p>
-  <p>The resulting LibTiff version would transparently support reading traditional 
-    32bit ClassicTIFF files, and 64bit BigTIFF files, as well as writing either 
-    ClassicTIFF or BigTIFF files based on a flag in the TIFFOpen/TIFFClientOpen call.</p>
-  <h2>4. Intellectual Property and Licensing</h2>
-  <p>The licensing agreement of LibTiff will remain unchanged.</p>
-  <h2>5. Contact information</h2>
-  <p>Please contact <a href="mailto:warmerdam@pobox.com">Frank Warmerdam</a> and/or 
-    <a href="mailto:info@awaresystems.be">Joris Van Damme</a> for more information 
-    on sponsorship agreements.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/html/Makefile.in b/html/Makefile.in
index c831bfd6..9cfc279c 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -15,7 +15,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.49.2.7 2009-08-20 20:23:52 bfriesen Exp $
+# $Id: Makefile.in,v 1.49.2.8 2009-08-20 22:31:00 bfriesen Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
diff --git a/html/bigtiffdesign.html b/html/bigtiffdesign.html
deleted file mode 100644
index b8be93ab..00000000
--- a/html/bigtiffdesign.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
-<head>
-<title>BigTIFF Design</title>
-</head>
-<body>
-
-<h1>BigTIFF Design</h1>
-
-<p>This is the HTML equivalent of a former Wiki working place for preparing a 64-bit (larger than 4GB) TIFF 
-format specification. The design is based on a proposal by Steve Carlsen of Adobe, with input from various 
-other parties.</p>
-
-<h2>Briefly</h2>
-<ul>
-<li>Version = 43</li>
-
-<li>8-byte offset to first IFD</li>
-<li>Value/Offset fields are 8 bytes</li>
-<li>8-byte offset to the next IFD</li>
-<li>add TIFFType of LONG8, an 8 byte (unsigned) int</li>
-<li>StripOffsets and TileOffsets and ByteCounts can be LONG8</li>
-</ul>
-
-<h2>More Detail</h2>
-<ul>
-<li>The Version ID, in header bytes 2-3, formerly decimal 42, now changes to 43</li>
-
-<li>Header bytes 4-5 contain the decimal number 8.<ul>
-  <li>If there is some other number here, a reader should give up.</li>
-  <li>This is to provide a nice way to move to 16-byte pointers some day.</li></ul></li>
-<li>Header bytes 6-7 are reserved and must be zero.<ul>
-  <li>If they're not, a reader should give up.</li></ul></li>
-<li>Header bytes 8-15 contain the 8-byte offset to the first IFD.</li>
-<li>Value/Offset fields are 8 bytes long, and take up bytes 8-15 in an IFD entry.<ul>
-
-  <li>If the value is <= 8 bytes, it must be stored in the field.</li>
-  <li>All values must begin at an 8-byte-aligned address.</li></ul></li>
-<li>8-byte offset to the Next_IFD, at the end of an IFD.</li>
-<li>To keep IFD entries 8-byte-aligned, we begin with an 8-byte (instead of 2-byte) count of the number of directory entries.</li>
-<li>Add TIFFTypes of LONG8 (= 16), an 8 byte (unsigned) int, and SLONG8 (= 17).</li>
-<li>Add TIFFType IFD8 (=18) an 8byte IFD offset.</li>
-<li>StripOffsets and TileOffsets and ByteCounts may be LONG8 or the traditionally allowed LONG or SHORT.</li>
-
-<li>The proposed extension is ".tf8", and call it "8-Byte TIFF".</li>
-</ul>
-<p>Otherwise, it's just like "original TIFF." ("TIFF Classic?")</p>
-
-<h2>Open Issues</h2>
-<ul>
-<li>What to call the new format<ul>
-  <li>ChrisCox -- I don't think end users will understand what "8-byte TIFF" means</li>
-  <li>AndreyKiselev - 23 Sep 2004 -- What about TIFF64? "64" is a widely used buzzword and should be directly associated with the 64-bit offsets and 64-bit architectures.</li></ul></li>
-
-<li>What 3 character file extension to use (gotta be DOS compatible)</li>
-<li>What 4 character file type to use (for Macintosh)</li>
-<li>What MIME type to use</li>
-</ul>
-
-<h2>Samples</h2>
-<p><a href="http://libtiff.maptools.org/BigTIFF/BigTIFFexamples.zip">Example files</a> from Steve Carlsen</p>
-
-<h2>Changes</h2>
-
-<ul>
-<li>TIFFType 13 is ttIFD, 14 is assigned to ttUnicode, and 15 is assigned to ttComplex. So, I changed the types for ttLong8 and ttSLong8 to 16 and 17, respectively.<ul>
-  <li>AndreyKiselev - 23 Sep 2004 -- Where are these fields defined? Is there any new Technical Note or something? And what is encoding behind the word "Unicode"?</li>
-  <li>ChrisCox - 27 Sep 2004 -- They are in the Adobe TIFF definitions.  I am still working on releasing updated TIFF documentation.</li></ul></li>
-<li>Added list of open issues.</li>
-<li>settle on version 43</li>
-<li>cleanup</li>
-<li>TIFFType 18 (8 byte IFD) added.</li>
-
-<li>Clarified that fields which may be LONG8 can also be one of the old supported types.</li>
-</ul>
-
-<h2>See also</h2>
-<p><a href="http://www.awaresystems.be/imaging/tiff/bigtiff.html">AWare Systems' informal overview of the BigTIFF proposal</a></p>
-
-</body>
-</html>
diff --git a/html/document.html b/html/document.html
index fc7ee55b..12f138f5 100644
--- a/html/document.html
+++ b/html/document.html
@@ -38,14 +38,10 @@ There is a FAQ, related both to TIFF format and libtiff library:
 <A HREF="http://www.awaresystems.be/imaging/tiff/faq.html">
 http://www.awaresystems.be/imaging/tiff/faq.html</A>
 
-<P>
-There is a preliminary <a href="bigtiffdesign.html">BigTIFF Design</a> for
-a TIFF variation supporting files larger than 4GB.
-
 <HR>
 
 <ADDRESS>
- Last updated: $Date: 2006-07-10 18:13:52 $
+ Last updated: $Date: 2009-08-20 22:31:00 $
 </ADDRESS>
 
 </BODY>
diff --git a/html/index.html b/html/index.html
index f0f0b04b..4653fc06 100644
--- a/html/index.html
+++ b/html/index.html
@@ -24,11 +24,7 @@
     </tr>
     <tr>
       <th>Latest Stable Release</th>
-      <td><a href="v3.8.2.html">v3.8.2</a></td>
-    </tr>
-    <tr>
-      <th>Latest Development Release</th>
-      <td><a href="v3.9.0beta.html">v3.9.0beta</a></td>
+      <td><a href="v3.9.0.html">v3.9.0</a></td>
     </tr>
     <tr>
       <th>Master Download Site</th>
@@ -99,7 +95,8 @@
     The persons responsible for putting up this site and putting together
     versions &gt;= 3.5.1 are
     <a href="http://pobox.com/~warmerdam">Frank Warmerdam</a>,
-    <a href="mailto:dron@ak4719.spb.edu">Andrey Kiselev</a> and Mike Welles.
+    <a href="mailto:dron@ak4719.spb.edu">Andrey Kiselev</a>, Bob Friesenhahn, 
+Joris Van Damme and Lee Howard.
   </p>
   <p>
     The following sections are included in this documentation:
@@ -118,12 +115,9 @@
     <li><a href="misc.html">Acknowledgements and copyright issues</a></li>
     <li><a href="man/index.html">Man Pages</a></li>
   </ul>
-  <p>
-    <b>News</b>: We are about to start work on <a href="BigTIFFProposal.html">BigTIFF support in LibTiff</a>.
-  </p>
   <hr>
   <p>
-    Last updated  $Date: 2007-07-13 14:00:47 $.
+    Last updated  $Date: 2009-08-20 22:31:00 $.
   </p>
 </body>
 </html>
diff --git a/html/v3.9.0.html b/html/v3.9.0.html
new file mode 100644
index 00000000..89c8d045
--- /dev/null
+++ b/html/v3.9.0.html
@@ -0,0 +1,261 @@
+<HTML>
+<HEAD>
+<TITLE>
+	Changes in TIFF v3.9.0
+</TITLE>
+</HEAD>
+
+<BODY BGCOLOR=white>
+<FONT FACE="Helvetica, Arial, Sans">
+<FONT FACE="Helvetica, Arial, Sans"> 
+
+<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.9.0<BR>
+<B>Previous Version</B>: <A HREF=v3.9.0beta.html>v3.9.0beta</a><BR>
+<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
+ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
+<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
+http://www.remotesensing.org/libtiff</a> 
+<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="#hightlights">Major Changes</A>
+<LI><A HREF="#configure">Changes in the software configuration</A>
+<LI><A HREF="#libtiff">Changes in libtiff</A>
+<LI><A HREF="#tools">Changes in the tools</A>
+<LI><A HREF="#contrib">Changes in the contrib area</A>
+</UL>
+<p> 
+<P><HR WIDTH=65% ALIGN=left>
+
+<!--------------------------------------------------------------------------->
+
+<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
+
+<UL>
+	<li> All of the major changes since 3.8.0 were incorporated in
+	the v3.9.0beta release.  This is a stable release from a
+	stable maintenance branch which incorporates many bug and
+	security fixes needed by existing users of 3.X.X series
+	libraries.  Any future major changes will be in the 4.0.X
+	series of releases.
+
+</UL>
+
+
+<P><HR WIDTH=65% ALIGN=left>
+<!--------------------------------------------------------------------------->
+
+<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
+
+<UL>
+
+	<li> Updated autotools: Autoconf 2.64, Automake 1.11, libtool
+	2.2.6.
+
+	<li> Enabled support for Automake silent build rules
+	(--enable-silent-rules or 'make V=0')
+
+	<li> Enabled support for Automake colorized tests.
+
+	<li> Added detection of a 64-bit integer type so that bundled
+	utilities (like tiffcrop) can use it when necessary.  Note
+	that this version of libtiff does not require a 64-bit integer
+	type but libtiff 4.0 does.
+
+</UL>
+
+<P><HR WIDTH=65% ALIGN=left>
+
+<!--------------------------------------------------------------------------->
+
+<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
+
+<UL>
+	<li> libtiff/{Makefile.am, Makefile.v}: Do not distribute
+	tiffconf.h, remove tif_config.h/tiffconf.h during cleaning. As
+	per bug <a
+	href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1573">http://bugzilla.remotesensing.org/show_bug.cgi?id=1573</a>
+
+	<li> tif_dirinfo.c: _TIFFMergeFields() now only merges in
+	field definitions that are missing.  Existing definitions are
+	silently ignored.  (Bug #1585)
+
+	<li> tif_write.c: Rip out the fancy logic in
+	TIFFAppendToStrip() for establishing if an existing tile can
+	be rewritten to the same location by comparing the current
+	size to all the other blocks in the same directory.  This is
+	dangerous in many situations and can easily corrupt a file.
+	(observed in esoteric GDAL situation that's hard to document).
+	This change involves leaving the stripbytecount[] values
+	unaltered till TIFFAppendToStrip().  Now we only write a block
+	back to the same location it used to be at if the new data is
+	the same size or smaller - otherwise we move it to the end of
+	file.
+
+	<li> tif_dirwrite.c: Try to avoid writing out a full
+	readbuffer of tile data when writing the directory just
+	because we have BEENWRITING at some point in the past.  This
+	was causing odd junk to be written out in a tile of data when
+	a single tile had an interleaving of reading and writing with
+	reading last.  (highlighted by gdal
+	autotest/gcore/tif_write.py test 7.
+
+	<li> tif_predict.c: use working buffer in PredictorEncodeTile
+	to avoid modifying callers buffer.  <a
+	href="http://trac.osgeo.org/gdal/ticket/1965">http://trac.osgeo.org/gdal/ticket/1965</a>
+
+	<li> tif_predict.c/h, tif_lzw.c, tif_zip.c: Improvements so
+	that predictor based encoding and decoding works in read-write
+	update mode properly.  <a
+	href="http://trac.osgeo.org/gdal/ticket/1948">http://trac.osgeo.org/gdal/ticket/1948</a>
+
+	<li> configure.com, libtiff/tif_vms.c: Better OpenVMS
+	support. Patches from Alexey Chupahin.
+
+	<li> tif_fax3.c: fix leak of FAXCS state (per bug 1603).
+
+	<li> tif_fax3.c: Make find0span() and find1span() non-inline
+	to make MSVC 6.0 compiler happy.
+
+	<li> tif_codec.c: Avoid NULL pointer dereferencing for exotic
+	compression codec codes.
+
+	<li> tif_dirread.c: zero tif->tif_dir after freeing the
+	directory in TIFFReadCustomDirectory().  I don't exactly
+	remember why this was important.
+
+	<li> tif_dirwrite.c: Fix potential memory leak writing large
+	double tags.
+
+	<li> tif_dirread.c: Fix unchecked malloc result.
+
+	<li> libtiff/tif_lzw.c: Properly zero out the codetable. As
+	per bug <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=1929">http://bugzilla.maptools.org/show_bug.cgi?id=1929</a>
+
+	<li> libtiff/tif_lzw.c: Properly zero out the string
+	table. Fixes CVE-2008-2327 security issue.
+
+	<li> libtiff/tif_jbig.c: Support the JBIG-KIT 2.0
+	(compatibility with the older versions retained).
+
+	<li> libtiff/tif_getimage.c,tiffio.h: removed all use of
+	UaToAa and Bitmap16to8 arrays in TIFFRGBAImage structure to
+	restore ABI compatability.  These were just an attempt to
+	speed up processing with precalculated tables.  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=1979">http://bugzilla.maptools.org/show_bug.cgi?id=1979</a>
+
+	<li> libtiff/tif_codec.c: Avoid printing c->name if it does not exist.
+
+	<li> libtiff/tif_getimage.c, tiffio.h: More ABI corrections.
+	Removed SubsamplingHor/Ver from TIFFRGBAImage structure.  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=1980">http://bugzilla.maptools.org/show_bug.cgi?id=1980</a>
+
+	<li> libtiff/tif_jpeg.c: Avoid errors if the application
+	writes a full strip for the last partial strip in a jpeg
+	compressed file.  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=1981">http://bugzilla.maptools.org/show_bug.cgi?id=1981</a>
+
+	<li> libtiff/tiffio.h: GCC will now validate format
+	specifications for TIFFError(), TIFFErrorExt(), TIFFWarning(),
+	and TIFFWarningExt() in order to reveal bugs.  Cleaned up
+	resulting warnings throughout for 32 bit build only.
+
+	<li> libtiff/tiffiop.h: Add private type declarations for
+	int64, and uint64 so that bundled utilities (like tiffcrop)
+	can use it when necessary.
+
+	<li> libtiff/tif_predict.c: Add support for 32bit integer
+	horz. predictors.
+	<a href="http://bugzilla.maptools.org/show_bug.cgi?id=1911">http://bugzilla.maptools.org/show_bug.cgi?id=1911</a>
+
+	<li> libtiff/tif_luv.c: Fix handling of tiled logluv images.
+	<a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=2005">http://bugzilla.maptools.org/show_bug.cgi?id=2005</a>
+
+	<li> libtiff/tif_write.c: do not override the planar
+	configuration to be contig for one sample files if planar
+	configuration is already set.  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=2057">http://bugzilla.maptools.org/show_bug.cgi?id=2057</a>
+
+	<li> libtiff/tif_lzw.c: Fix buffer underflow bug.  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=2065">http://bugzilla.maptools.org/show_bug.cgi?id=2065</a>
+
+	<li> libtiff/tif_luv.c: correct return codes from encoderow to
+	be 1 on success instead of zero.  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=2069">http://bugzilla.maptools.org/show_bug.cgi?id=2069</a>
+
+	<li> libtiff/tif_print.c (TIFFPrintDirectory): Applied patch
+	for "tag error may cause segfault in tif_print.c."  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=1896">http://bugzilla.maptools.org/show_bug.cgi?id=1896</a>
+
+</UL>
+
+<P><HR WIDTH=65% ALIGN=left>
+
+<!-------------------------------------------------------------------------->
+	
+<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
+
+<UL>
+	<li> tools/tiff2pdf.c: Fixed setting of alpha value per report
+	on list.
+
+	<li> tools/tiffsplit.c: Get rid of unsafe strcpy()/strcat()
+	calls when doing the filename/path construction.
+
+	<li> tools/tiff2pdf.c: More appropriate format string in
+	t2p_write_pdf_string(); avoid signed/unsigned mismatch.
+
+	<li> tools/tiffsplit.c: Use dynamically allocated array
+	instead of static when constructing output file names.
+
+	<li> tools/tiffcrop.c, man/tiffcrop.1: Incorporated
+	significant functionality update from Richard Nolde.
+
+	<li> tools/tiff2ps.c: Incorporated significant functionality
+	update from Richard Nolde.  In particular, support for
+	rotating the image by 90, 180, 270, and 'auto' has been added.
+
+	<li> tools/tiff2ps.c: Remove spurious message printed to
+	stderr.
+
+	<li> tools/tiffsplit.c: fix sampleformat to be shortv instead
+	of longv.
+
+	<li> tools/{rgb2ycbcr.c, tiff2rgba.c}: Applied patch for
+	CVE-2009-2347 libtiff: integer overflows in various
+	inter-color space conversion tools.  <a
+	href="http://bugzilla.maptools.org/show_bug.cgi?id=2079">http://bugzilla.maptools.org/show_bug.cgi?id=2079</a>
+
+</UL>
+
+<P><HR WIDTH=65% ALIGN=left>
+
+<!--------------------------------------------------------------------------->
+
+<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
+
+<UL> 
+
+	<li> None
+
+</UL>
+
+Last updated $Date: 2009-08-20 22:31:00 $.
+
+</BODY>
+</HTML>
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
index 6e8be008..7328bebb 100644
--- a/libtiff/tif_ojpeg.c
+++ b/libtiff/tif_ojpeg.c
@@ -1,4 +1,4 @@
-/* $Id: tif_ojpeg.c,v 1.24.2.1 2007-04-07 14:58:30 dron Exp $ */
+/* $Id: tif_ojpeg.c,v 1.24.2.2 2009-08-20 22:31:00 bfriesen Exp $ */
 
 /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0
    specification is now totally obsolete and deprecated for new applications and
@@ -2382,8 +2382,8 @@ OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo)
 {
 	TIFF* tif=(TIFF*)cinfo->client_data;
 	OJPEGState* sp=(OJPEGState*)tif->tif_data;
-	void* mem;
-	uint32 len;
+	void* mem=0;
+	uint32 len=0;
 	if (OJPEGWriteStream(tif,&mem,&len)==0)
 	{
 		TIFFErrorExt(tif->tif_clientdata,"LibJpeg","Premature end of JPEG data");
diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h
index 91089840..aec110dd 100644
--- a/libtiff/tiffvers.h
+++ b/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.0beta\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.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 20070713
+#define TIFFLIB_VERSION 20090820
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
index ed1daf61..aeccc927 100644
--- a/tools/tiffcrop.c
+++ b/tools/tiffcrop.c
@@ -1,4 +1,4 @@
-/* $Id: tiffcrop.c,v 1.3.2.5 2009-01-11 20:09:15 bfriesen Exp $ */
+/* $Id: tiffcrop.c,v 1.3.2.6 2009-08-20 22:31:00 bfriesen Exp $ */
 
 /* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of
  * the image data through additional options listed below
@@ -117,7 +117,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 #include <math.h>
 #include <ctype.h>
 #include <limits.h>