summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbfriesen <bfriesen>2011-10-22 17:02:49 +0000
committerbfriesen <bfriesen>2011-10-22 17:02:49 +0000
commitbdccc01eff401a841f4a6df10eb2c7280267d3cc (patch)
tree3e160a438f09261f0dfccb4217f451e5b42c9a21
parentd3f4cc7a6b6a4275d79ccc0be9bf6f7b9811a8ee (diff)
downloadlibtiff-bdccc01eff401a841f4a6df10eb2c7280267d3cc.tar.gz
* tools/tiffsplit.c (tiffcp): TIFFGetField count field should be
uint32 type for TIFFTAG_JPEGTABLES. Patch by Christophe Deroulers.
-rw-r--r--ChangeLog6
-rw-r--r--tools/tiffsplit.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 28962fd7..c39295ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-22 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * tools/tiffsplit.c (tiffcp): TIFFGetField count field should be
+ uint32 type for TIFFTAG_JPEGTABLES. Patch by Christophe
+ Deroulers.
+
2011-06-08 Dwight Kelly <dkelly@apago.com>
* tif_apple.c: fix for Bug 2247 - tif_apple.c _tiffSizeProc() did
diff --git a/tools/tiffsplit.c b/tools/tiffsplit.c
index 4e4aa313..7699496f 100644
--- a/tools/tiffsplit.c
+++ b/tools/tiffsplit.c
@@ -1,4 +1,4 @@
-/* $Id: tiffsplit.c,v 1.14.2.5 2010-12-11 19:16:26 faxguy Exp $ */
+/* $Id: tiffsplit.c,v 1.14.2.6 2011-10-22 17:02:49 bfriesen Exp $ */
/*
* Copyright (c) 1992-1997 Sam Leffler
@@ -172,7 +172,7 @@ tiffcp(TIFF* in, TIFF* out)
CopyField(TIFFTAG_SAMPLESPERPIXEL, samplesperpixel);
CopyField(TIFFTAG_COMPRESSION, compression);
if (compression == COMPRESSION_JPEG) {
- uint16 count = 0;
+ uint32 count = 0;
void *table = NULL;
if (TIFFGetField(in, TIFFTAG_JPEGTABLES, &count, &table)
&& count > 0 && table) {