cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "%I64d" printf() formatter instead of "%lld" with MSVC compiler.

Browse Source
This commit is contained in:
Andrey Kiselev 2007-07-19 15:50:28 +00:00
parent b95ab39ef3
commit 7d5b41ee4f
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libtiff/tif_strip.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_strip.c,v 1.28 2007-06-27 16:09:58 joris Exp $ */
/* $Id: tif_strip.c,v 1.29 2007-07-19 15:50:28 dron Exp $ */
/*
* Copyright (c) 1991-1997 Sam Leffler
@ -174,9 +174,17 @@ TIFFRawStripSize64(TIFF* tif, uint32 strip)
if (bytecount == 0)
{
#if defined(__WIN32__) && defined(_MSC_VER)
TIFFErrorExt(tif->tif_clientdata, module,
"%llu: Invalid strip byte count, strip %lu",
(unsigned long long) bytecount, (unsigned long) strip);
"%I64u: Invalid strip byte count, strip %lu",
(unsigned __int64) bytecount,
(unsigned long) strip);
#else
TIFFErrorExt(tif->tif_clientdata, module,
"%llu: Invalid strip byte count, strip %lu",
(unsigned long long) bytecount,
(unsigned long) strip);
#endif
bytecount = (uint64) -1;
}

20
libtiff/tif_thunder.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_thunder.c,v 1.8 2007-04-10 16:45:42 joris Exp $ */
/* $Id: tif_thunder.c,v 1.9 2007-07-19 15:50:28 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -122,11 +122,21 @@ 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)
TIFFErrorExt(tif->tif_clientdata, module,
"%s data at scanline %lud (%llu != %llu)",
npixels < maxpixels ? "Not enough" : "Too much",
(unsigned long) tif->tif_row, (unsigned long long) npixels,
(unsigned long long) maxpixels);
"%s data at scanline %lu (%I64u != %I64u)",
npixels < maxpixels ? "Not enough" : "Too much",
(unsigned long) tif->tif_row,
(unsigned __int64) npixels,
(unsigned __int64) maxpixels);
#else
TIFFErrorExt(tif->tif_clientdata, module,
"%s data at scanline %lu (%llu != %llu)",
npixels < maxpixels ? "Not enough" : "Too much",
(unsigned long) tif->tif_row,
(unsigned long long) npixels,
(unsigned long long) maxpixels);
#endif
return (0);
}
return (1);