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

Comment out set but not used variables which annoy GCC 4.7

Browse Source
This commit is contained in:
Bob Friesenhahn 2012-07-06 19:18:31 +00:00
parent f8180e5811
commit 39c8d4b160
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libtiff/tif_dirinfo.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirinfo.c,v 1.114 2011-05-17 00:21:17 fwarmerdam Exp $ */ /* $Id: tif_dirinfo.c,v 1.115 2012-07-06 19:18:31 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -348,7 +348,7 @@ _TIFFMergeFields(TIFF* tif, const TIFFField info[], uint32 n)
{ {
static const char module[] = "_TIFFMergeFields"; static const char module[] = "_TIFFMergeFields";
static const char reason[] = "for fields array"; static const char reason[] = "for fields array";
TIFFField** tp; /* TIFFField** tp; */
uint32 i; uint32 i;
tif->tif_foundfield = NULL; tif->tif_foundfield = NULL;
@ -369,7 +369,7 @@ _TIFFMergeFields(TIFF* tif, const TIFFField info[], uint32 n)
return 0; return 0;
} }
tp = tif->tif_fields + tif->tif_nfields; /* tp = tif->tif_fields + tif->tif_nfields; */
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
const TIFFField *fip = const TIFFField *fip =
TIFFFindField(tif, info[i].field_tag, TIFF_ANY); TIFFFindField(tif, info[i].field_tag, TIFF_ANY);

6
libtiff/tif_dirwrite.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirwrite.c,v 1.76 2011-02-18 20:53:04 fwarmerdam Exp $ */ /* $Id: tif_dirwrite.c,v 1.77 2012-07-06 19:18:31 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -2570,7 +2570,7 @@ _TIFFRewriteField(TIFF* tif, uint16 tag, TIFFDataType in_datatype,
tmsize_t count, void* data) tmsize_t count, void* data)
{ {
static const char module[] = "TIFFResetField"; static const char module[] = "TIFFResetField";
const TIFFField* fip = NULL; /* const TIFFField* fip = NULL; */
uint16 dircount; uint16 dircount;
tmsize_t dirsize; tmsize_t dirsize;
uint8 direntry_raw[20]; uint8 direntry_raw[20];
@ -2586,7 +2586,7 @@ _TIFFRewriteField(TIFF* tif, uint16 tag, TIFFDataType in_datatype,
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Find field definition. */ /* Find field definition. */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
fip = TIFFFindField(tif, tag, TIFF_ANY); /*fip =*/ TIFFFindField(tif, tag, TIFF_ANY);
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Do some checking this is a straight forward case. */ /* Do some checking this is a straight forward case. */

6
libtiff/tif_read.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_read.c,v 1.40 2012-06-01 00:55:09 fwarmerdam Exp $ */ /* $Id: tif_read.c,v 1.41 2012-07-06 19:22:58 bfriesen Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -50,7 +50,7 @@ TIFFFillStripPartial( TIFF *tif, int strip, tmsize_t read_ahead, int restart )
uint64 unused_data; uint64 unused_data;
uint64 read_offset; uint64 read_offset;
tmsize_t cc, to_read; tmsize_t cc, to_read;
tmsize_t bytecountm; /* tmsize_t bytecountm; */
if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount) if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount)
return 0; return 0;
@ -61,7 +61,7 @@ TIFFFillStripPartial( TIFF *tif, int strip, tmsize_t read_ahead, int restart )
* bound on the size of a buffer we'll use?). * bound on the size of a buffer we'll use?).
*/ */
bytecountm=(tmsize_t) td->td_stripbytecount[strip]; /* bytecountm=(tmsize_t) td->td_stripbytecount[strip]; */
if (read_ahead*2 > tif->tif_rawdatasize) { if (read_ahead*2 > tif->tif_rawdatasize) {
assert( restart ); assert( restart );