diff options
| author | bfriesen <bfriesen> | 2012-07-06 19:18:31 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2012-07-06 19:18:31 +0000 |
| commit | e0b9604fce1624a5dbfecb151ad4a783ace37a28 (patch) | |
| tree | 0a4452b33381314523df85c1ab066e9477fdc278 | |
| parent | 2f0b9eec39cffe310d216c29881b6366ba3b592d (diff) | |
| download | libtiff-e0b9604fce1624a5dbfecb151ad4a783ace37a28.tar.gz | |
Comment out set but not used variables which annoy GCC 4.7
| -rw-r--r-- | libtiff/tif_dirinfo.c | 6 | ||||
| -rw-r--r-- | libtiff/tif_dirwrite.c | 6 | ||||
| -rw-r--r-- | libtiff/tif_read.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c index 06b5a5a0..f9506bb2 100644 --- a/libtiff/tif_dirinfo.c +++ b/libtiff/tif_dirinfo.c @@ -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 @@ -348,7 +348,7 @@ _TIFFMergeFields(TIFF* tif, const TIFFField info[], uint32 n) { static const char module[] = "_TIFFMergeFields"; static const char reason[] = "for fields array"; - TIFFField** tp; + /* TIFFField** tp; */ uint32 i; tif->tif_foundfield = NULL; @@ -369,7 +369,7 @@ _TIFFMergeFields(TIFF* tif, const TIFFField info[], uint32 n) return 0; } - tp = tif->tif_fields + tif->tif_nfields; + /* tp = tif->tif_fields + tif->tif_nfields; */ for (i = 0; i < n; i++) { const TIFFField *fip = TIFFFindField(tif, info[i].field_tag, TIFF_ANY); diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c index 11738cfe..fa20609e 100644 --- a/libtiff/tif_dirwrite.c +++ b/libtiff/tif_dirwrite.c @@ -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 @@ -2570,7 +2570,7 @@ _TIFFRewriteField(TIFF* tif, uint16 tag, TIFFDataType in_datatype, tmsize_t count, void* data) { static const char module[] = "TIFFResetField"; - const TIFFField* fip = NULL; + /* const TIFFField* fip = NULL; */ uint16 dircount; tmsize_t dirsize; uint8 direntry_raw[20]; @@ -2586,7 +2586,7 @@ _TIFFRewriteField(TIFF* tif, uint16 tag, TIFFDataType in_datatype, /* -------------------------------------------------------------------- */ /* Find field definition. */ /* -------------------------------------------------------------------- */ - fip = TIFFFindField(tif, tag, TIFF_ANY); + /*fip =*/ TIFFFindField(tif, tag, TIFF_ANY); /* -------------------------------------------------------------------- */ /* Do some checking this is a straight forward case. */ diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c index 3ba31e3f..fe36e683 100644 --- a/libtiff/tif_read.c +++ b/libtiff/tif_read.c @@ -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 @@ -50,7 +50,7 @@ TIFFFillStripPartial( TIFF *tif, int strip, tmsize_t read_ahead, int restart ) uint64 unused_data; uint64 read_offset; tmsize_t cc, to_read; - tmsize_t bytecountm; + /* tmsize_t bytecountm; */ if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount) 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?). */ - bytecountm=(tmsize_t) td->td_stripbytecount[strip]; + /* bytecountm=(tmsize_t) td->td_stripbytecount[strip]; */ if (read_ahead*2 > tif->tif_rawdatasize) { assert( restart ); |