diff options
author | erouault <erouault> | 2016-08-16 08:54:01 +0000 |
---|---|---|
committer | erouault <erouault> | 2016-08-16 08:54:01 +0000 |
commit | e423e0b529b371b7d77ee000449a8617f6521d65 (patch) | |
tree | 55f4ef16a12f6ebbddd854afeed3d666fd3afce3 | |
parent | b93faea38b674000aefe18e6df15265ccb146df1 (diff) | |
download | libtiff-e423e0b529b371b7d77ee000449a8617f6521d65.tar.gz |
* tools/tiffcrop.c: fix C99'ism.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | tools/tiffcrop.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2016-08-16 Even Rouault <even.rouault at spatialys.com> + + * tools/tiffcrop.c: fix C99'ism. + 2016-08-15 Even Rouault <even.rouault at spatialys.com> * tools/tiff2bw.c: fix weight computation that could result of color diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c index 9e833b77..8751f939 100644 --- a/tools/tiffcrop.c +++ b/tools/tiffcrop.c @@ -1,4 +1,4 @@ -/* $Id: tiffcrop.c,v 1.38 2016-08-15 21:05:40 erouault Exp $ */ +/* $Id: tiffcrop.c,v 1.39 2016-08-16 08:54:01 erouault Exp $ */ /* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of * the image data through additional options listed below @@ -6001,6 +6001,7 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c } else { + uint32 buffsize_check; readunit = STRIP; TIFFGetFieldDefaulted(in, TIFFTAG_ROWSPERSTRIP, &rowsperstrip); stsize = TIFFStripSize(in); @@ -6017,7 +6018,6 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c TIFFError("loadImage", "Integer overflow when calculating buffer size"); exit(-1); } - uint32 buffsize_check; buffsize_check = ((length * width * spp * bps) + 7); if (length != ((buffsize_check - 7) / width / spp / bps)) { |