diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2002-06-19 12:54:53 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2002-06-19 12:54:53 (GMT) |
| commit | aefc39ac325f25d1978ad07785ee0b57617d17a5 (patch) | |
| tree | fca00816adc4c767109b92e4892f77abc40be3b9 /tools/gifconv | |
| parent | 64b7be4a52b14dfefc7729aaf8be6649fb668cc4 (diff) | |
| download | hdf5-aefc39ac325f25d1978ad07785ee0b57617d17a5.zip hdf5-aefc39ac325f25d1978ad07785ee0b57617d17a5.tar.gz hdf5-aefc39ac325f25d1978ad07785ee0b57617d17a5.tar.bz2 | |
[svn-r5667] Purpose:
Code cleanup
Description:
Turn on more warnings in the IRIX builds and clean them up.
Platforms tested:
IRIX64 6.5 (modi4) w/parallel
Diffstat (limited to 'tools/gifconv')
| -rw-r--r-- | tools/gifconv/decompress.c | 13 | ||||
| -rw-r--r-- | tools/gifconv/gifread.c | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/tools/gifconv/decompress.c b/tools/gifconv/decompress.c index 6cc5468..269635d 100644 --- a/tools/gifconv/decompress.c +++ b/tools/gifconv/decompress.c @@ -19,15 +19,16 @@ char *cmd; FILE *fp; +static WORD + XC = 0, YC = 0, /* Output X and Y coords of current pixel */ + InitCodeSize, /* Starting code size, used during Clear */ + CodeSize, /* Code size, read from GIF header */ + BytesPerScanline, /* Bytes per scanline in output raster */ + IWidth, IHeight; /* image dimensions */ static int BitOffset = 0, /* Bit Offset of next code */ - XC = 0, YC = 0, /* Output X and Y coords of current pixel */ Pass = 0, /* Used by output routine if WORDerlaced pic */ OutCount = 0, /* Decompressor output 'stack count' */ - IWidth, IHeight, /* image dimensions */ - BytesPerScanline, /* Bytes per scanline in output raster */ - CodeSize, /* Code size, read from GIF header */ - InitCodeSize, /* Starting code size, used during Clear */ Code, /* Value returned by ReadCode */ MaxCode, /* limiting value for current code size */ ClearCode, /* GIF clear code */ @@ -162,7 +163,7 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead) OutCount = 0; BitOffset = 0; - DataMask = (1L << ((GifHead->PackedField & 0x07) +1)) -1; + DataMask = (1 << ((GifHead->PackedField & 0x07) +1)) -1; Raster = GifImageDesc->GIFImage; /* Check for image seperator */ diff --git a/tools/gifconv/gifread.c b/tools/gifconv/gifread.c index 3e01801..36cdd13 100644 --- a/tools/gifconv/gifread.c +++ b/tools/gifconv/gifread.c @@ -382,9 +382,6 @@ ReadDataSubBlocks(BYTE **MemGif2, /* GIF image file input FILE stream } -#ifdef COMMENTED_OUT - *ptr1++ = (BYTE) NULL; /* Add NULL to simulate Terminator value */ -#endif /* COMMENTED_OUT */ *ptr1++ = '\0'; return(ptr2); /* Return a pointer to the sub-block data */ |