diff options
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_next.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_next.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_next.c b/src/3rdparty/libtiff/libtiff/tif_next.c index 0ba61ae..695fc5d 100644 --- a/src/3rdparty/libtiff/libtiff/tif_next.c +++ b/src/3rdparty/libtiff/libtiff/tif_next.c @@ -44,12 +44,12 @@ #define WHITE ((1<<2)-1) static int -NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) +NeXTDecode(TIFF* tif, uint8_t* buf, tmsize_t occ, uint16_t s) { static const char module[] = "NeXTDecode"; unsigned char *bp, *op; tmsize_t cc; - uint8* row; + uint8_t* row; tmsize_t scanline, n; (void) s; @@ -101,9 +101,9 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) break; } default: { - uint32 npixels = 0, grey; + uint32_t npixels = 0, grey; tmsize_t op_offset = 0; - uint32 imagewidth = tif->tif_dir.td_imagewidth; + uint32_t imagewidth = tif->tif_dir.td_imagewidth; if( isTiled(tif) ) imagewidth = tif->tif_dir.td_tilewidth; @@ -115,7 +115,7 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) */ op = row; for (;;) { - grey = (uint32)((n>>6) & 0x3); + grey = (uint32_t)((n >> 6) & 0x3); n &= 0x3f; /* * Ensure the run does not exceed the scanline @@ -127,8 +127,8 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) if (npixels >= imagewidth) break; if (op_offset >= scanline ) { - TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %ld", - (long) tif->tif_row); + TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %"PRIu32, + tif->tif_row); return (0); } if (cc == 0) @@ -140,17 +140,17 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s) } } } - tif->tif_rawcp = (uint8*) bp; + tif->tif_rawcp = (uint8_t*) bp; tif->tif_rawcc = cc; return (1); bad: - TIFFErrorExt(tif->tif_clientdata, module, "Not enough data for scanline %ld", - (long) tif->tif_row); + TIFFErrorExt(tif->tif_clientdata, module, "Not enough data for scanline %"PRIu32, + tif->tif_row); return (0); } static int -NeXTPreDecode(TIFF* tif, uint16 s) +NeXTPreDecode(TIFF* tif, uint16_t s) { static const char module[] = "NeXTPreDecode"; TIFFDirectory *td = &tif->tif_dir; @@ -158,7 +158,7 @@ NeXTPreDecode(TIFF* tif, uint16 s) if( td->td_bitspersample != 2 ) { - TIFFErrorExt(tif->tif_clientdata, module, "Unsupported BitsPerSample = %d", + TIFFErrorExt(tif->tif_clientdata, module, "Unsupported BitsPerSample = %"PRIu16, td->td_bitspersample); return (0); } |