From 68d82703df909073eb3afd87d60b5d9291ceaa1b Mon Sep 17 00:00:00 2001
From: Andrey Kiselev <[EMAIL REDACTED]>
Date: Sat, 7 Apr 2007 15:01:16 +0000
Subject: [PATCH] *** empty log message ***
---
ChangeLog | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 8071de03..ef34da57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-04-07 Andrey Kiselev <dron@ak4719.spb.edu>
+
+ * libtiff/{tif_dir.h, tif_dirread.c, tif_dirinfo.c, tif_jpeg.c,
+ tif_fax3.c, tif_jbig.c, tif_luv.c, tif_ojpeg.c, tif_pixarlog.c,
+ tif_predict.c, tif_zip.c}: Finally fix bug
+
+ http://bugzilla.remotesensing.org/show_bug.cgi?id=1274
+
+ by introducing _TIFFMergeFieldInfo() returning integer error status
+ instead of void in case of problems with field merging (e.g., if the
+ field with such a tag already registered). TIFFMergeFieldInfo() in
+ public API remains void. Use _TIFFMergeFieldInfo() everywhere and
+ check returned value.
+
2007-04-07 Frank Warmerdam <warmerdam@pobox.com>
* contrib/addtiffo/tif_overview.c: Fix problems with odd sized output