diff --git a/ChangeLog b/ChangeLog
index 6cad15cf..b258ce19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1999-09-26 Mike Welles mike@onshore.com
+ * Corrected alpha versioning.
+
+ * Removed distinction between alpha and release targets in Makefile.in.
+
+ * added release.stamp target, which tags cvs tree, and updates
+ "RELEASE-DATE"
+
+ * added releasediff target, which diffs tree with source as of
+ date in "RELEASE-DATE"
+
+ * Ticked up version to 3.5.2 (alpha 01 -- but I think we'll moving
+ away from alpha/non-alpha distinctions).
+
+ * updated html to reflect release
+
1999-09-23
* Set O_BINARY for tif_unix.c open() ... used on cygwin for instance.
@@ -5,6 +21,7 @@
* Added CYGWIN case in configure.
Fri Sep 17 00:13:51 CEST 1999 Mike Welles
+
* Applied Francois Dagand's patch to handle fax decompression bug.
(sizes >= 65536 were failing)
diff --git a/Makefile b/Makefile
index d3e18f12..e335a6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#! smake
-# $Header: /cvs/maptools/cvsroot/libtiff/Attic/Makefile,v 1.2 1999-08-25 19:38:48 warmerda Exp $
+# $Header: /cvs/maptools/cvsroot/libtiff/Attic/Makefile,v 1.3 1999-09-26 22:03:46 mwelles Exp $
#
# Warning, this file was automatically created by the TIFF configure script
#
@@ -31,7 +31,7 @@
SRCDIR = .
#
-# VERSION: v3.5.1
+# VERSION: v3.5.2
# DATE: Wed Aug 25 15:30:36 EST 1999
# TARGET: i586-unknown-linux
# CCOMPILER: /usr/bin/gcc
diff --git a/Makefile.in b/Makefile.in
index 348a2968..8bef7f56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
#! smake
-# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.2 1999-08-25 19:34:25 warmerda Exp $
+# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.3 1999-09-26 22:03:46 mwelles Exp $
#
# @WARNING@
#
@@ -401,51 +401,6 @@ CONFIG=\
rcsclean:
rcsclean ${TIFFFILES} && co ${TIFFFILES}
-alpha:
- (cd ${SRCDIR}/dist; sh newversion)
- -${MAKE} clean
- ${MAKE} alpha.stamp
- ${SRCDIR}/configure ${CONFIG}
- ${MAKE} product
- ${MAKE} alpha.tar
-
-# stamp relevant files according to current alpha
-alpha.stamp:
- VERSION="Alpha@DIST_ALPHA@"; \
- NOW=`date`; \
- for i in ${TIFFFILES}; do \
- REV=`rlog -h -d"$$NOW" ${SRCDIR}/$$i|fgrep 'head:'|awk '{print $$2}'`;\
- rcs "-N$$VERSION:$$REV" "-sExp:$$REV" ${SRCDIR}/$$i && co -sExp ${SRCDIR}/$$i; \
- done
-
-purge-old-alphas:
- 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; \
- done
-
-alphadiff:
- -@for i in ${TIFFFILES}; do \
- rcsdiff -r${ALPHA} ${SRCDIR}/$$i; \
- done
-
-# create alpha distribution archive
-alpha.tar:
- VERSION="@VERSION@"; \
- rm -f tiff-$$VERSION $$VERSION $$VERSION-tar; \
- ln -s ${SRCDIR} tiff-$$VERSION; \
- (for i in ${DISTFILES}; do \
- echo $$i; \
- done) | sed "s;.*;tiff-$$VERSION/&;" >$$VERSION; \
- tar cvf $$VERSION-tar `cat $$VERSION`; \
- rm -f tiff-$$VERSION-tar.${ZIPSUF}; \
- cat $$VERSION-tar | ${COMPRESS} >tiff-$$VERSION-tar.${ZIPSUF}; \
- rm -f tiff-$$VERSION $$VERSION $$VERSION-tar;
-
release:
(cd ${SRCDIR}/dist; sh newversion)
-${MAKE} clean
@@ -454,11 +409,15 @@ release:
${MAKE} product
${MAKE} release.tar
+# stamp relevant files according to current alpha
release.stamp:
- NOW=`date`; \
- for i in ${TIFFFILES}; do \
- REV=`rlog -h -d"$$NOW" ${SRCDIR}/$$i|fgrep 'head:'|awk '{print $$2}'`;\
- rcs "-NRelease@DIST_MAJOR@_@DIST_MINOR@_@DIST_TYPE@:$$REV" "-sRel:$$REV" ${SRCDIR}/$$i && co -sRel ${SRCDIR}/$$i; \
+ cvs tag -R "Release"
+ date "+%m/%d/%Y" > RELEASE-DATE
+
+#diffs since last release
+releasediff:
+ -@for i in ${TIFFFILES}; do \
+ cvs diff -D`cat RELEASE-DATE` ${SRCDIR}/$$i; \
done
# create release distribution archive
diff --git a/README-IPTC b/README-IPTC
deleted file mode 100644
index c70f5ff5..00000000
--- a/README-IPTC
+++ /dev/null
@@ -1,41 +0,0 @@
-To: sam@engr.sgi.com
-cc: adam@onshore.com
-cc: billr@corbis.com
-cc: magick@wizards.dupont.com
-Subject: libtiff fork
-X-Mailer: VM 6.63 under Emacs 20.3.2
---text follows this line--
-
-I've finished merging a forked libtiff that was being shipped with
-ImageMagick (that added IPTC newsphoto support) with the last libtiff
-release (tiff-v3.4beta037). I'm going to make this available at
-ftp://ftp.onshore.com/pub/libtiff (as tiff-v3.4beta037-IPTC).
-
-I'm very reluctant to fork code, and I woud refrain, but for the following:
-
- 1. Repeated mail to you about the patches has gone unanswered.
-
- 2. I keep getting mail from people strugging to get IPTC newphoto support
- to work properly with ImageMagick.
-
- 3. The NT source distibution was already shipping with a forked version.
-
-In order for the situation to be less confusing, I'm going to make an
-archive of the forked version available.
-
-I very much would like for there not to be a fork. Are you still
-maintaining libtiff? If not, is there a current maintainer?
-
-I'm willing to adopt it if there isn't. I'd hate to see such an
-important library fragment. It's extremely likely that onShore
-(http://onshore.com/), will donate web space, bandwidth, and listserv
-services if so.
-
-
-
-------------------------------------------------------
-M. L. Welles mike@onShore.com
- http://fifth.net/
--------------------------------------------------------
-
-
diff --git a/README-v3.5.1 b/README-v3.5.1
deleted file mode 100644
index b51914d2..00000000
--- a/README-v3.5.1
+++ /dev/null
@@ -1,8 +0,0 @@
-Release 3.5.1 is merely a renaming of v3.4-beta037-IPTC to bump the
-version number so that the maintainer switch is clear and folks will
-know which problems I caused. See README-IPTC forchages between v3.5
-and the last version that Sam released.
-
-
---Mike Welles (mike@onshore.com)
-
diff --git a/RELEASE-DATE b/RELEASE-DATE
new file mode 100644
index 00000000..a5f14b0b
--- /dev/null
+++ b/RELEASE-DATE
@@ -0,0 +1 @@
+9/26/1999
\ No newline at end of file
diff --git a/VERSION b/VERSION
index d5c0c991..87ce4929 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.1
+3.5.2
diff --git a/config.site b/config.site
index 1c2959ff..95266b95 100644
--- a/config.site
+++ b/config.site
@@ -1,4 +1,4 @@
-# $Header: /cvs/maptools/cvsroot/libtiff/Attic/config.site,v 1.1 1999-07-27 21:50:26 mike Exp $
+# $Header: /cvs/maptools/cvsroot/libtiff/Attic/config.site,v 1.2 1999-09-26 22:03:46 mwelles Exp $
#
# TIFF Software
#
@@ -94,8 +94,8 @@
# JPEG support requires release 5 or later of the IJG code,
# which you can find on the Internet at ftp.uu.net:/graphics/jpeg/.
#
-#DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-5a" # directory for jpeg include files
-#DIR_JPEGLIB=../src/jpeg-5a # directory for libjpeg
+#DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files
+#DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg
#
# Deflate-specific parameters; used when Deflate support is enabled (see above).
diff --git a/dist/tiff.alpha b/dist/tiff.alpha
index 316b4d7b..5b20d89d 100644
--- a/dist/tiff.alpha
+++ b/dist/tiff.alpha
@@ -1 +1 @@
-define ALPHA 037
+define ALPHA 01
diff --git a/html/index.html b/html/index.html
index e7729a16..8c40882e 100644
--- a/html/index.html
+++ b/html/index.html
@@ -14,10 +14,10 @@ TIFF Software
Home Page:
http://www.libtiff.org
FAQ Page: forthcoming
-Latest Release: v3.5.1
-Latest Software: v3.5.1
+Latest Release: v3.5.2
+Latest Software: v3.5.2
Master FTP Site: ftp.onshore.com , directory pub/libtiff (Active mode FTP only!)
-HTTP Download: http://www.libtiff.org/tiff-v3.5.1.tar.gz
+HTTP Download: http://www.libtiff.org/tiff-v3.5.2.tar.gz
Mailing List: tiff@olympiakos.com
Mailing List Subscription: tiff-request@olympiakos.com ("subscribe tiff" in body of message).
Mailing List Archive: http://www.remotesensing.org/lists/libtiff_archive/maillist.html
@@ -58,8 +58,8 @@ responsible for day to day maintenance.
the TIFF mailing list: tiff@olympiakos.com.
- The person responsible for putting up this site and putting together version 3.5.1 is Mike Welles.
+
The persons responsible for putting up this site and putting together versions >= 3.5.1 are
+Frank Warmerdam and Mike Welles.
@@ -81,7 +81,7 @@ The following sections are included in this documentation:
-$Id: index.html,v 1.13 1999-09-06 15:25:10 mwelles Exp $
+$Id: index.html,v 1.14 1999-09-26 22:03:46 mwelles Exp $
+
+
+
+
+TIFF CHANGE INFORMATION
+
+
+
+
+
+
+CHANGES IN THE SOFTWARE CONFIGURATION:
+
+
+ - Corrected alpha versioning.
+
+
- Removed distinction between alpha and release targets in Makefile.in.
+
+
- Added release.stamp target, which tags cvs tree, and updates
+ "RELEASE-DATE"
+
+
- Added releasediff target, which diffs tree with source as of
+ date in "RELEASE-DATE"
+
+
- Ticked up version to 3.5.2 (alpha 01 -- but I think we'll moving
+ away from alpha/non-alpha distinctions).
+
+
+
+
+
+CHANGES IN LIBTIFF:
+
+
+
+ - Added IRIX/gcc, and OSF/1 4.x support on behalf of
+ Albert Chin-A-Young
+
+
- Added TIFFReassignTagToIgnore() API on behalf of
+ Bruce Cameron . Man page still pending.
+
+
- pre-remove so link before softlink in LINUXdso action in
+ libtiff/Makefile.in to avoid failure on LINUXdso builds other than
+ the first.
+
+
- Fixed problem with cvtcmap() in tif_getimage.c modifying the
+ colormaps owned by the TIFF handle itself when trying to fixup wrong
+ (eight bit) colormaps. Corrected by maintaining a private copy of
+ the colormap.
+
+
- Added TIFFReadRGBATile()/TIFFReadRGBAStrip() support in
+ tif_getimage.c.
+
+
- Applied "a" mode fix to tif_win32.c/TIFFOpen() as suggested
+ by Christopher Lawton
+
+
- Set O_BINARY for tif_unix.c open() ... used on cygwin for instance.
+
+
- Added CYGWIN case in configure.
+
+
- Applied Francois Dagand's patch to handle fax decompression bug.
+ (sizes >= 65536 were failing)
+
+
+
+
+CHANGES IN THE TOOLS:
+
+
+ - Added addtiffo (add overviews to a TIFF file) in contrib. Didn't
+ put it in tools since part of it is in C++.
+
+
+ TIFF home page.
+
+
+
+Last updated $Date: 1999-09-26 22:03:46 $.
+
+
diff --git a/html/v3.5.2.html b/html/v3.5.2.html
new file mode 100644
index 00000000..ab467b5c
--- /dev/null
+++ b/html/v3.5.2.html
@@ -0,0 +1,108 @@
+
+