diff options
| author | joris <joris> | 2007-03-31 01:04:52 +0000 |
|---|---|---|
| committer | joris <joris> | 2007-03-31 01:04:52 +0000 |
| commit | ca6dbf85ca1612cf68208e5654b85ad24da43900 (patch) | |
| tree | 014101e9cba6b60b94cd32ef9cc32990f22bd0a3 /libtiff/tif_thunder.c | |
| parent | 0983f5b718ebf50feb01251baaa243698a803741 (diff) | |
| download | libtiff-ca6dbf85ca1612cf68208e5654b85ad24da43900.tar.gz | |
BigTIFF upgrade in progress - widespread temp mess - does not compile now
Diffstat (limited to 'libtiff/tif_thunder.c')
| -rw-r--r-- | libtiff/tif_thunder.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libtiff/tif_thunder.c b/libtiff/tif_thunder.c index 98bad203..3e7dd911 100644 --- a/libtiff/tif_thunder.c +++ b/libtiff/tif_thunder.c @@ -1,4 +1,4 @@ -/* $Id: tif_thunder.c,v 1.5 2005-12-21 12:23:13 joris Exp $ */ +/* $Id: tif_thunder.c,v 1.6 2007-03-31 01:04:53 joris Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -72,7 +72,7 @@ ThunderDecode(TIFF* tif, tidata_t op, tsize_t maxpixels) tsize_t npixels; bp = (unsigned char *)tif->tif_rawcp; - cc = tif->tif_rawcc; + cc = tif->tif_rawcc; ddd lastpixel = 0; npixels = 0; while (cc > 0 && npixels < maxpixels) { @@ -119,7 +119,7 @@ ThunderDecode(TIFF* tif, tidata_t op, tsize_t maxpixels) } } tif->tif_rawcp = (tidata_t) bp; - tif->tif_rawcc = cc; + tif->tif_rawcc = cc; ddd if (npixels != maxpixels) { TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "ThunderDecode: %s data at scanline %ld (%lu != %lu)", @@ -131,7 +131,7 @@ ThunderDecode(TIFF* tif, tidata_t op, tsize_t maxpixels) } static int -ThunderDecodeRow(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s) +ThunderDecodeRow(TIFF* tif, tidata_t buf, tsize_t occ, uint16 s) { tidata_t row = buf; @@ -139,8 +139,8 @@ ThunderDecodeRow(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s) while ((long)occ > 0) { if (!ThunderDecode(tif, row, tif->tif_dir.td_imagewidth)) return (0); - occ -= tif->tif_scanlinesize; - row += tif->tif_scanlinesize; + occ -= tif->tif_scanlinesize; ddd + row += tif->tif_scanlinesize; ddd } return (1); } @@ -149,8 +149,8 @@ int TIFFInitThunderScan(TIFF* tif, int scheme) { (void) scheme; - tif->tif_decoderow = ThunderDecodeRow; - tif->tif_decodestrip = ThunderDecodeRow; + tif->tif_decoderow = ThunderDecodeRow; ddd + tif->tif_decodestrip = ThunderDecodeRow; ddd return (1); } #endif /* THUNDER_SUPPORT */ |