From 9ec07df122a6a29a5f9168d3b6ff251c8781bc82 Mon Sep 17 00:00:00 2001 From: Mike Welles Date: Sun, 28 Nov 1999 20:15:36 +0000 Subject: [PATCH] * Fixed apocalypse-inducing y2k bug in contrib/ras/ras2tiff.c * Did some casts cleaning up to reduce compiler warnings in tif_fax3.c, from Bruce Carmeron -- modifications of changes made by Frank (sun cc still complained on cast). * Added tiffconf.h to install target per request from Bill Radcliffe : "We need a way for ImageMagick to know features have been compiled into the TIFF library in order to handle things properly". --- ChangeLog | 18 ++++++++++++++---- Makefile.in | 8 ++++---- VERSION | 2 +- contrib/ras/ras2tif.c | 7 +++++-- contrib/ras/tif2ras.c | 2 +- dist/newalpha | 4 ++-- dist/tiff.version | 2 +- libtiff/Makefile.in | 4 ++-- libtiff/tif_fax3.c | 7 ++++--- 9 files changed, 34 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b711c22..7b174ccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +199-11-28 Mike Welles + + * Fixed apocalypse-inducing y2k bug in contrib/ras/ras2tiff.c + + * Did some casts cleaning up to reduce compiler warnings in tif_fax3.c, + from Bruce Carmeron -- modifications of + changes made by Frank (sun cc still complained on cast). + + * Added tiffconf.h to install target per request from Bill + Radcliffe : "We need a way for ImageMagick to + know features have been compiled into the TIFF library in order to + handle things properly". + Sat Nov 27 16:49:21 1999 Frank Warmerdam * fixed various VC++ warnings as suggested by Gilles Vollant @@ -11,12 +24,9 @@ Wed Nov 24 12:08:16 1999 Frank Warmerdam 1999-11-22 Mike Welles * HTML-ized the man pages, added to html/man -1999-11-22 Mike Welles - * Removed LZW Compression to comply with Unisys patent extortion. 1999-09-29 Mike Welles - * Corrected one remaining 16 -> 32 bit value in tif_fax3.c, From Ivo Penzar - \ No newline at end of file + diff --git a/Makefile.in b/Makefile.in index 75ffaa5b..4fe5b0a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ #! smake -# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.5 1999-09-28 17:22:20 mwelles Exp $ +# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.6 1999-11-28 20:15:36 mwelles Exp $ # # @WARNING@ # @@ -394,6 +394,7 @@ CONTRIBFILES=\ contrib/addtiffo/rawblockedimage.cpp \ contrib/addtiffo/rawblockedimage.h \ ${NULL} + DISTFILES=\ ${TIFFFILES} \ dist/tiff.alpha \ @@ -416,9 +417,8 @@ rcsclean: release: (cd ${SRCDIR}/dist; sh newversion) - -${MAKE} clean ${MAKE} release.stamp - ${SRCDIR}/configure ${CONFIG} +# ${SRCDIR}/configure ${CONFIG} # ${MAKE} product ${MAKE} release.tar @@ -436,7 +436,7 @@ releasediff: # create release distribution archive release.tar: VERSION="@VERSION@"; \ - rm -f tiff-$$VERSION $$VERSION $$VERSION-tar; \ + rm -f ../tiff-$$VERSION $$VERSION $$VERSION-tar; \ ln -s ${SRCDIR} tiff-$$VERSION; \ (for i in ${DISTFILES}; do \ echo $$i; \ diff --git a/VERSION b/VERSION index 87ce4929..444877d4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.2 +3.5.3 diff --git a/contrib/ras/ras2tif.c b/contrib/ras/ras2tif.c index 25c59021..b11b8799 100644 --- a/contrib/ras/ras2tif.c +++ b/contrib/ras/ras2tif.c @@ -34,6 +34,7 @@ static char sccsid[] = "@(#)ras2tif.c 1.2 90/03/06"; * 06-Mar-90: fix bug in SCALE() macro. * got rid of xres and yres, (they weren't working anyways). * fixed bpsl calculation. + * 25-Nov-99: y2k fix (year as 1900 + tm_year) * * Description: * This program takes a Sun Rasterfile [see rasterfile(5)] as input and @@ -93,6 +94,7 @@ main(argc, argv) long width, height; long rowsperstrip; + int year; short photometric; short samplesperpixel; short bitspersample; @@ -102,8 +104,9 @@ main(argc, argv) gettimeofday(&tv, (struct timezone *) NULL); ct = localtime(&tv.tv_sec); - sprintf(datetime, "19%02d:%02d:%02d %02d:%02d:%02d", - ct->tm_year, ct->tm_mon + 1, ct->tm_mday, + year=1900 + ct->tm_year; + sprintf(datetime, "%04d:%02d:%02d %02d:%02d:%02d", + year, ct->tm_mon + 1, ct->tm_mday, ct->tm_hour, ct->tm_min, ct->tm_sec); setbuf(stderr, NULL); diff --git a/contrib/ras/tif2ras.c b/contrib/ras/tif2ras.c index 344c94de..cbae5cee 100644 --- a/contrib/ras/tif2ras.c +++ b/contrib/ras/tif2ras.c @@ -1,5 +1,5 @@ #ifndef lint -static char sccsid[] = "@(#)tif2ras.c 1.2 90/03/06"; +static char id[] = "$Id: tif2ras.c,v 1.2 1999-11-28 20:15:36 mwelles Exp $"; #endif /*- * tif2ras.c - Converts from a Tagged Image File Format image to a Sun Raster. diff --git a/dist/newalpha b/dist/newalpha index 7bb8e0c9..04c2e324 100755 --- a/dist/newalpha +++ b/dist/newalpha @@ -1,8 +1,8 @@ #! /bin/sh -# $Header: /cvs/maptools/cvsroot/libtiff/dist/Attic/newalpha,v 1.1 1999-07-27 21:50:27 mike Exp $ +# $Header: /cvs/maptools/cvsroot/libtiff/dist/Attic/newalpha,v 1.2 1999-11-28 20:15:36 mwelles Exp $ if test -r tiff.alpha; then ALPHA=`cat tiff.alpha`; rm -f tiff.alpha - echo "$ALPHA" | awk '{ printf "define ALPHA %03d\n", $3+1}' > tiff.alpha + echo "$ALPHA" | awk '{ printf "define ALPHA %1d\n", $3+1}' > tiff.alpha else echo "define ALPHA 001" >tiff.alpha fi diff --git a/dist/tiff.version b/dist/tiff.version index 7d607d13..4d12a3be 100644 --- a/dist/tiff.version +++ b/dist/tiff.version @@ -1 +1 @@ -define TIFF_VNUM "3.5.2 (release)" +define TIFF_VNUM "3.5.3 (release)" diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index 0c80a3dd..c71e3ccf 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -1,4 +1,4 @@ -# $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.3 1999-09-08 12:40:31 warmerda Exp $ +# $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.4 1999-11-28 20:15:36 mwelles Exp $ # # Tag Image File Format Library # @@ -313,7 +313,7 @@ tif_vms.o: ${SRCDIR}/tif_vms.c tif_win3.o: ${SRCDIR}/tif_win3.c ${CC} -c ${CFLAGS} ${SRCDIR}/tif_win3.c -INCS = ${SRCDIR}/tiff.h ${SRCDIR}/tiffio.h +INCS = ${SRCDIR}/tiff.h ${SRCDIR}/tiffio.h ${SRCDIR}/tiffconf.h installHdrs: ${INCS} ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@ diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c index b6851ced..a175fe38 100644 --- a/libtiff/tif_fax3.c +++ b/libtiff/tif_fax3.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.5 1999-11-27 21:23:42 warmerda Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.6 1999-11-28 20:15:36 mwelles Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -659,7 +659,7 @@ Fax3PutEOL(TIFF* tif) Fax3EncodeState* sp = EncoderState(tif); u_int bit = sp->bit; int data = sp->data; - u_int code, length; + u_int code, length, tparm; if (sp->b.groupoptions & GROUP3OPT_FILLBITS) { /* @@ -674,7 +674,8 @@ Fax3PutEOL(TIFF* tif) else align = sp->bit - align; code = 0; - _PutBits(tif, ((u_int)0), ((u_int)align)); + tparm=align; + _PutBits(tif, 0, tparm); } } code = EOL, length = 12;