cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed apocalypse-inducing y2k bug in contrib/ras/ras2tiff.c

Browse Source 
*  Did some casts cleaning up to reduce compiler warnings in tif_fax3.c,
	   from Bruce Carmeron <cameron@petris.com> -- modifications of
	   changes made by Frank (sun cc still complained on cast).

	*  Added tiffconf.h to install target per request from Bill
	   Radcliffe <billr@corbis.com>: "We need a way for ImageMagick to
 	   know features have been compiled into the TIFF library in order to
	   handle things properly".
This commit is contained in:
Mike Welles 1999-11-28 20:15:36 +00:00
parent 29e8a99543
commit 9ec07df122
9 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,16 @@
199-11-28 Mike Welles <mike@onshore.com>
* 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 <cameron@petris.com> -- modifications of
changes made by Frank (sun cc still complained on cast).
* Added tiffconf.h to install target per request from Bill
Radcliffe <billr@corbis.com>: "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 <warmerda@gdal.velocet.ca> Sat Nov 27 16:49:21 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
* fixed various VC++ warnings as suggested by Gilles Vollant * fixed various VC++ warnings as suggested by Gilles Vollant
@ -11,12 +24,9 @@ Wed Nov 24 12:08:16 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
1999-11-22 Mike Welles <mike@onshore.com> 1999-11-22 Mike Welles <mike@onshore.com>
* HTML-ized the man pages, added to html/man * HTML-ized the man pages, added to html/man
1999-11-22 Mike Welles <mike@onshore.com>
* Removed LZW Compression to comply with Unisys patent extortion. * Removed LZW Compression to comply with Unisys patent extortion.
1999-09-29 Mike Welles <mike@onshore.com> 1999-09-29 Mike Welles <mike@onshore.com>
* Corrected one remaining 16 -> 32 bit value in tif_fax3.c, * Corrected one remaining 16 -> 32 bit value in tif_fax3.c,
From Ivo Penzar <ivo.penzar@infolink-software.com. From Ivo Penzar <ivo.penzar@infolink-software.com.

8
Makefile.in
View File

@ -1,5 +1,5 @@
#! smake #! 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@ # @WARNING@
# #
@ -394,6 +394,7 @@ CONTRIBFILES=\
contrib/addtiffo/rawblockedimage.cpp \ contrib/addtiffo/rawblockedimage.cpp \
contrib/addtiffo/rawblockedimage.h \ contrib/addtiffo/rawblockedimage.h \
${NULL} ${NULL}
DISTFILES=\ DISTFILES=\
${TIFFFILES} \ ${TIFFFILES} \
dist/tiff.alpha \ dist/tiff.alpha \
@ -416,9 +417,8 @@ rcsclean:
release: release:
(cd ${SRCDIR}/dist; sh newversion) (cd ${SRCDIR}/dist; sh newversion)
-${MAKE} clean
${MAKE} release.stamp ${MAKE} release.stamp
${SRCDIR}/configure ${CONFIG} # ${SRCDIR}/configure ${CONFIG}
# ${MAKE} product # ${MAKE} product
${MAKE} release.tar ${MAKE} release.tar
@ -436,7 +436,7 @@ releasediff:
# create release distribution archive # create release distribution archive
release.tar: release.tar:
VERSION="@VERSION@"; \ VERSION="@VERSION@"; \
rm -f tiff-$$VERSION $$VERSION $$VERSION-tar; \ rm -f ../tiff-$$VERSION $$VERSION $$VERSION-tar; \
ln -s ${SRCDIR} tiff-$$VERSION; \ ln -s ${SRCDIR} tiff-$$VERSION; \
(for i in ${DISTFILES}; do \ (for i in ${DISTFILES}; do \
echo $$i; \ echo $$i; \

2
VERSION
View File

@ -1 +1 @@
3.5.2 3.5.3

7
contrib/ras/ras2tif.c
View File

@ -34,6 +34,7 @@ static char sccsid[] = "@(#)ras2tif.c 1.2 90/03/06";
* 06-Mar-90: fix bug in SCALE() macro. * 06-Mar-90: fix bug in SCALE() macro.
* got rid of xres and yres, (they weren't working anyways). * got rid of xres and yres, (they weren't working anyways).
* fixed bpsl calculation. * fixed bpsl calculation.
* 25-Nov-99: y2k fix (year as 1900 + tm_year) <mike@onshore.com>
* *
* Description: * Description:
* This program takes a Sun Rasterfile [see rasterfile(5)] as input and * This program takes a Sun Rasterfile [see rasterfile(5)] as input and
@ -93,6 +94,7 @@ main(argc, argv)
long width, long width,
height; height;
long rowsperstrip; long rowsperstrip;
int year;
short photometric; short photometric;
short samplesperpixel; short samplesperpixel;
short bitspersample; short bitspersample;
@ -102,8 +104,9 @@ main(argc, argv)
gettimeofday(&tv, (struct timezone *) NULL); gettimeofday(&tv, (struct timezone *) NULL);
ct = localtime(&tv.tv_sec); ct = localtime(&tv.tv_sec);
sprintf(datetime, "19%02d:%02d:%02d %02d:%02d:%02d", year=1900 + ct->tm_year;
ct->tm_year, ct->tm_mon + 1, ct->tm_mday, 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); ct->tm_hour, ct->tm_min, ct->tm_sec);
setbuf(stderr, NULL); setbuf(stderr, NULL);

2
contrib/ras/tif2ras.c
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
/*- /*-
* tif2ras.c - Converts from a Tagged Image File Format image to a Sun Raster. * tif2ras.c - Converts from a Tagged Image File Format image to a Sun Raster.

4
dist/newalpha vendored
View File

@ -1,8 +1,8 @@
#! /bin/sh #! /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 if test -r tiff.alpha; then
ALPHA=`cat tiff.alpha`; rm -f tiff.alpha 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 else
echo "define ALPHA 001" >tiff.alpha echo "define ALPHA 001" >tiff.alpha
fi fi

2
dist/tiff.version vendored
View File

@ -1 +1 @@
define TIFF_VNUM "3.5.2 (release)" define TIFF_VNUM "3.5.3 (release)"

4
libtiff/Makefile.in
View File

@ -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 # Tag Image File Format Library
# #
@ -313,7 +313,7 @@ tif_vms.o: ${SRCDIR}/tif_vms.c
tif_win3.o: ${SRCDIR}/tif_win3.c tif_win3.o: ${SRCDIR}/tif_win3.c
${CC} -c ${CFLAGS} ${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} installHdrs: ${INCS}
${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@ ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@

7
libtiff/tif_fax3.c
View File

@ -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 * Copyright (c) 1990-1997 Sam Leffler
@ -659,7 +659,7 @@ Fax3PutEOL(TIFF* tif)
Fax3EncodeState* sp = EncoderState(tif); Fax3EncodeState* sp = EncoderState(tif);
u_int bit = sp->bit; u_int bit = sp->bit;
int data = sp->data; int data = sp->data;
u_int code, length; u_int code, length, tparm;
if (sp->b.groupoptions & GROUP3OPT_FILLBITS) { if (sp->b.groupoptions & GROUP3OPT_FILLBITS) {
/* /*
@ -674,7 +674,8 @@ Fax3PutEOL(TIFF* tif)
else else
align = sp->bit - align; align = sp->bit - align;
code = 0; code = 0;
_PutBits(tif, ((u_int)0), ((u_int)align)); tparm=align;
_PutBits(tif, 0, tparm);
} }
} }
code = EOL, length = 12; code = EOL, length = 12;