summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbfriesen <bfriesen>2014-08-31 20:32:53 +0000
committerbfriesen <bfriesen>2014-08-31 20:32:53 +0000
commit2384f3ef86fd69c47264c02eb39f1fd7efa3bc74 (patch)
tree616b87e98eb8e775a7e2f63d5e3b2bed2724cc9f
parentd6db12cc9c33fc8d3a7edae3c96a3375e3518fe4 (diff)
downloadlibtiff-2384f3ef86fd69c47264c02eb39f1fd7efa3bc74.tar.gz
* libtiff/tif_dirread.c (TIFFReadDirEntryOutputErr): Incorrect
count for tag should be a warning rather than an error since errors terminate processing.
-rw-r--r--ChangeLog6
-rw-r--r--libtiff/tif_dirread.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 59557fa9..53e89c1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * libtiff/tif_dirread.c (TIFFReadDirEntryOutputErr): Incorrect
+ count for tag should be a warning rather than an error since
+ errors terminate processing.
+
2014-06-07 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* tools/tiff2rgba.c (]): Fixed tiff2rgba usage message in that zip
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index 19a26e27..e125039d 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirread.c,v 1.178 2012-08-19 16:56:34 bfriesen Exp $ */
+/* $Id: tif_dirread.c,v 1.179 2014-08-31 20:32:53 bfriesen Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -3374,7 +3374,7 @@ static void TIFFReadDirEntryOutputErr(TIFF* tif, enum TIFFReadDirEntryErr err, c
} else {
switch (err) {
case TIFFReadDirEntryErrCount:
- TIFFErrorExt(tif->tif_clientdata, module,
+ TIFFWarningExt(tif->tif_clientdata, module,
"Incorrect count for \"%s\"; tag ignored",
tagname);
break;