From cae87ed58a8306e2eea072e2e94b27efec7ed567 Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Sat, 22 Oct 2011 17:03:00 +0000 Subject: [PATCH] * tools/tiffsplit.c (tiffcp): TIFFGetField count field should be uint32 type for TIFFTAG_JPEGTABLES. Patch by Christophe Deroulers. --- ChangeLog | 6 ++++++ tools/tiffsplit.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 365dfcdd..31c94cd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-10-22 Bob Friesenhahn + + * tools/tiffsplit.c (tiffcp): TIFFGetField count field should be + uint32 type for TIFFTAG_JPEGTABLES. Patch by Christophe + Deroulers. + 2011-06-21 Frank Warmerdam * libtiff/libtiff.def: Restore TIFFMergeFieldInfo. diff --git a/tools/tiffsplit.c b/tools/tiffsplit.c index cddbc5c4..fa43d63f 100644 --- a/tools/tiffsplit.c +++ b/tools/tiffsplit.c @@ -1,4 +1,4 @@ -/* $Id: tiffsplit.c,v 1.21 2010-12-11 19:16:48 faxguy Exp $ */ +/* $Id: tiffsplit.c,v 1.22 2011-10-22 17:03:01 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) {