diff options
author | Andrey Kiselev <dron@ak4719.spb.edu> | 2004-10-01 14:11:01 +0000 |
---|---|---|
committer | Andrey Kiselev <dron@ak4719.spb.edu> | 2004-10-01 14:11:01 +0000 |
commit | ce258158bab90f2564b96e548328b69837ea5644 (patch) | |
tree | 2b9f6364d1eb2fdaea60f8d270c0722424ee92bf | |
parent | 830509e8704f77574ce7f9456c08b12fd4180575 (diff) | |
download | libtiff-git-ce258158bab90f2564b96e548328b69837ea5644.tar.gz |
*** empty log message ***
-rw-r--r-- | libtiff/tif_strip.c | 6 | ||||
-rw-r--r-- | libtiff/tif_tile.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c index 1d07adb5..5df682d3 100644 --- a/libtiff/tif_strip.c +++ b/libtiff/tif_strip.c @@ -1,4 +1,4 @@ -/* $Id: tif_strip.c,v 1.10 2004-09-29 07:42:52 dron Exp $ */ +/* $Id: tif_strip.c,v 1.11 2004-10-01 14:11:01 dron Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -34,7 +34,7 @@ static uint32 summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where) { - uint32 bytes = summand1 + summand2; + size_t bytes = summand1 + summand2; if (bytes - summand1 != summand2) { TIFFError(tif->tif_name, "Integer overflow in %s", where); @@ -47,7 +47,7 @@ summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where) static uint32 multiply(TIFF* tif, size_t nmemb, size_t elem_size, const char* where) { - uint32 bytes = nmemb * elem_size; + size_t bytes = nmemb * elem_size; if (elem_size && bytes / elem_size != nmemb) { TIFFError(tif->tif_name, "Integer overflow in %s", where); diff --git a/libtiff/tif_tile.c b/libtiff/tif_tile.c index 16f2cec0..bf3579c4 100644 --- a/libtiff/tif_tile.c +++ b/libtiff/tif_tile.c @@ -1,4 +1,4 @@ -/* $Id: tif_tile.c,v 1.6 2004-09-29 07:42:52 dron Exp $ */ +/* $Id: tif_tile.c,v 1.7 2004-10-01 14:11:01 dron Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -34,7 +34,7 @@ static uint32 summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where) { - uint32 bytes = summand1 + summand2; + size_t bytes = summand1 + summand2; if (bytes - summand1 != summand2) { TIFFError(tif->tif_name, "Integer overflow in %s", where); @@ -47,7 +47,7 @@ summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where) static uint32 multiply(TIFF* tif, size_t nmemb, size_t elem_size, const char* where) { - uint32 bytes = nmemb * elem_size; + size_t bytes = nmemb * elem_size; if (elem_size && bytes / elem_size != nmemb) { TIFFError(tif->tif_name, "Integer overflow in %s", where); |