diff options
| author | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2009-10-31 23:42:27 +0000 |
|---|---|---|
| committer | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2009-10-31 23:42:27 +0000 |
| commit | ffd59cba7033589d8d55f7e3d7d8383dc16ba98e (patch) | |
| tree | 0249148e3774b827eddd5aafcfe80f3a738d34a2 /libtiff/tif_pixarlog.c | |
| parent | c667654d23512569762c392d752020e9ef3456e3 (diff) | |
| download | libtiff-git-ffd59cba7033589d8d55f7e3d7d8383dc16ba98e.tar.gz | |
* libtiff/tif_pixarlog.c (PixarLogEncode): Fix non-important
warning noticed in Visual Studio 2005 build. Resolves "Bug 2068 -
Visual Studio 2005 64-bit warning in tif_pixarlog.c",
http://bugzilla.maptools.org/show_bug.cgi?id=2068
Diffstat (limited to 'libtiff/tif_pixarlog.c')
| -rw-r--r-- | libtiff/tif_pixarlog.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c index 99cb1248..8007ad5d 100644 --- a/libtiff/tif_pixarlog.c +++ b/libtiff/tif_pixarlog.c @@ -1,4 +1,4 @@ -/* $Id: tif_pixarlog.c,v 1.31 2007-10-01 12:43:49 joris Exp $ */ +/* $Id: tif_pixarlog.c,v 1.32 2009-10-31 23:42:27 bfriesen Exp $ */ /* * Copyright (c) 1996-1997 Sam Leffler @@ -1143,10 +1143,11 @@ PixarLogEncode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) we need to simplify this code to reflect a ZLib that is likely updated to deal with 8byte memory sizes, though this code will respond apropriately even before we simplify it */ - sp->stream.avail_in = n * sizeof(uint16); - if (sp->stream.avail_in != n * sizeof(uint16)) + sp->stream.avail_in = (uInt) (n * sizeof(uint16)); + if ((sp->stream.avail_in / sizeof(uint16)) != (uInt) n) { - TIFFErrorExt(tif->tif_clientdata, module, "ZLib cannot deal with buffers this size"); + TIFFErrorExt(tif->tif_clientdata, module, + "ZLib cannot deal with buffers this size"); return (0); } |