Demoted from EXIF_LOG_CODE_CORRUPT_DATA to EXIF_LOG_CODE_DEBUG the

MakerNote log messages that would result if a MakerNote were
rewritten by an application without rebasing the internal data
offsets.  The exif front end (at least) aborts processing if
such a log message is found, but these kinds of errors are
far too common (and practically unavoidable) to handle them
this way.

diff --git a/ChangeLog b/ChangeLog
index 3075235..902b517 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-10-08  Dan Fandrich <dan@coneharvesters.com>
 
+       * Demoted from EXIF_LOG_CODE_CORRUPT_DATA to EXIF_LOG_CODE_DEBUG the
+         MakerNote log messages that would result if a MakerNote were
+         rewritten by an application without rebasing the internal data
+         offsets.  The exif front end (at least) aborts processing if
+         such a log message is found, but these kinds of errors are
+         far too common (and practically unavoidable) to handle them
+         this way.
        * Released 0.6.18
 
 2009-10-06  Dan Fandrich <dan@coneharvesters.com>

diff --git a/libexif/canon/exif-mnote-data-canon.c b/libexif/canon/exif-mnote-data-canon.c
index 13dccfc..cdfcf0f 100644 (file)
--- a/libexif/canon/exif-mnote-data-canon.c
+++ b/libexif/canon/exif-mnote-data-canon.c
@@ -265,7 +265,7 @@ exif_mnote_data_canon_load (ExifMnoteData *ne,
                        size_t dataofs = o + 8;
                        if (s > 4) dataofs = exif_get_long (buf + dataofs, n->order) + 6;
                        if ((dataofs + s < s) || (dataofs + s < dataofs) || (dataofs + s > buf_size)) {
-                               exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
+                               exif_log (ne->log, EXIF_LOG_CODE_DEBUG,
                                        "ExifMnoteCanon",
                                        "Tag data past end of buffer (%u > %u)",
                                        dataofs + s, buf_size);

diff --git a/libexif/pentax/exif-mnote-data-pentax.c b/libexif/pentax/exif-mnote-data-pentax.c
index c55894b..8004b5e 100644 (file)
--- a/libexif/pentax/exif-mnote-data-pentax.c
+++ b/libexif/pentax/exif-mnote-data-pentax.c
@@ -306,7 +306,7 @@ exif_mnote_data_pentax_load (ExifMnoteData *en,
                                dataofs = exif_get_long (buf + dataofs, n->order) + 6;
                        if ((dataofs + s < dataofs) || (dataofs + s < s) ||
                                (dataofs + s > buf_size)) {
-                               exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+                               exif_log (en->log, EXIF_LOG_CODE_DEBUG,
                                                  "ExifMnoteDataPentax", "Tag data past end "
                                          "of buffer (%u > %u)", dataofs + s, buf_size);
                                continue;