diff options
| author | bfriesen <bfriesen> | 2011-04-02 20:54:08 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2011-04-02 20:54:08 +0000 |
| commit | 0e39daddb5be01f6be28d5302a5dcd901e8dfc22 (patch) | |
| tree | 6d9110ce51abd49cd54b0053ddbd5222830b95af /libtiff/tif_thunder.c | |
| parent | a599d3a74eb11cfae234a9a9c5c949430a10ea92 (diff) | |
| download | libtiff-0e39daddb5be01f6be28d5302a5dcd901e8dfc22.tar.gz | |
* configure.ac: Support configuring TIFF_INT64_FORMAT and
TIFF_UINT64_FORMAT appropriately for MinGW32.
* tools/tiffdump.c (ReadDirectory): MinGW32 needs to use WIN32
printf conventions for 64-bit types because it uses the WIN32 CRT.
* libtiff/{tif_dumpmode.c,tif_luv.c,tif_lzw.c,tif_print.c,
tif_read.c,tif_strip.c,tif_thunder.c}: MinGW32 needs to use WIN32
printf conventions for 64-bit types because it uses the WIN32 CRT.
* tools/tiff2pdf.c (t2p_write_pdf_string): Fix printf syntax not
understood by WIN32 CRT.
Diffstat (limited to 'libtiff/tif_thunder.c')
| -rw-r--r-- | libtiff/tif_thunder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_thunder.c b/libtiff/tif_thunder.c index 5f3257fb..390891c9 100644 --- a/libtiff/tif_thunder.c +++ b/libtiff/tif_thunder.c @@ -1,4 +1,4 @@ -/* $Id: tif_thunder.c,v 1.11 2011-03-21 16:02:27 fwarmerdam Exp $ */ +/* $Id: tif_thunder.c,v 1.12 2011-04-02 20:54:09 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -143,7 +143,7 @@ ThunderDecode(TIFF* tif, uint8* op, tmsize_t maxpixels) tif->tif_rawcp = (uint8*) bp; tif->tif_rawcc = cc; if (npixels != maxpixels) { -#if defined(__WIN32__) && defined(_MSC_VER) +#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) TIFFErrorExt(tif->tif_clientdata, module, "%s data at scanline %lu (%I64u != %I64u)", npixels < maxpixels ? "Not enough" : "Too much", |