* tools/{tiffcrop.c,tiffgt.c}: Applied patch from Oden Eriksson to

fix build with gcc when using the "-Wformat
-Werror=format-security" flags.
This commit is contained in:
Bob Friesenhahn 2009-08-30 17:38:51 +00:00
parent 61635e13d2
commit 840cb0032f
3 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2009-08-30 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* tools/{tiffcrop.c,tiffgt.c}: Applied patch from Oden Eriksson to
fix build with gcc when using the "-Wformat
-Werror=format-security" flags.
2009-08-29 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* test/{bmp2tiff_palette.sh, bmp2tiff_rgb.sh, gif2tiff.sh,

View File

@ -1,4 +1,4 @@
/* $Id: tiffcrop.c,v 1.12 2009-02-06 15:43:06 fwarmerdam Exp $ */
/* $Id: tiffcrop.c,v 1.13 2009-08-30 17:38:51 bfriesen Exp $ */
/* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of
* the image data through additional options listed below
@ -1981,7 +1981,7 @@ main(int argc, char* argv[])
(dump.format == DUMP_TEXT) ? "txt" : "raw");
if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL)
{
TIFFError ("Unable to open dump file %s for writing", temp_filename);
TIFFError ("Unable to open dump file %s for writing", "%s", temp_filename);
exit (-1);
}
dump_info(dump.infile, dump.format, "Reading image","%d from %s",
@ -1997,7 +1997,7 @@ main(int argc, char* argv[])
(dump.format == DUMP_TEXT) ? "txt" : "raw");
if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL)
{
TIFFError ("Unable to open dump file %s for writing", temp_filename);
TIFFError ("Unable to open dump file %s for writing", "%s", temp_filename);
exit (-1);
}
dump_info(dump.outfile, dump.format, "Writing image","%d from %s",

View File

@ -1,4 +1,4 @@
/* $Id: tiffgt.c,v 1.7 2006-03-23 14:54:02 dron Exp $ */
/* $Id: tiffgt.c,v 1.8 2009-08-30 17:38:51 bfriesen Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -204,7 +204,7 @@ initImage(void)
if (photo != (uint16) -1)
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, photo);
if (!TIFFRGBAImageBegin(&img, tif, stoponerr, title)) {
TIFFError(filelist[fileindex], title);
TIFFError(filelist[fileindex], "%s", title);
TIFFClose(tif);
tif = NULL;
return -1;