diff options
| author | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2011-04-02 20:54:08 +0000 |
|---|---|---|
| committer | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2011-04-02 20:54:08 +0000 |
| commit | 519b72700430b84c99db73a832c4c58f3e52ebcd (patch) | |
| tree | bc25b3e8fdc07d9fb99f0af50066589710caaf3f /libtiff/tif_dumpmode.c | |
| parent | b69a1998bedfabc32cd541408bffdef05bd01e45 (diff) | |
| download | libtiff-git-519b72700430b84c99db73a832c4c58f3e52ebcd.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_dumpmode.c')
| -rw-r--r-- | libtiff/tif_dumpmode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_dumpmode.c b/libtiff/tif_dumpmode.c index c668964f..a94cf0b3 100644 --- a/libtiff/tif_dumpmode.c +++ b/libtiff/tif_dumpmode.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dumpmode.c,v 1.13 2010-03-10 18:56:48 bfriesen Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dumpmode.c,v 1.14 2011-04-02 20:54:09 bfriesen Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -80,7 +80,7 @@ DumpModeDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) static const char module[] = "DumpModeDecode"; (void) s; if (tif->tif_rawcc < cc) { -#if defined(__WIN32__) && defined(_MSC_VER) +#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) TIFFErrorExt(tif->tif_clientdata, module, "Not enough data for scanline %lu, expected a request for at most %I64d bytes, got a request for %I64d bytes", (unsigned long) tif->tif_row, |