2005-04-27 Lutz Mueller <lutz@users.sourceforge.net>

	* configure.ac: AGE = 1
	* libexif/exif-entry.c (exif_entry_fix): Add a break to avoid unnecessary
	checks.

diff --git a/ChangeLog b/ChangeLog
index e45c457..7c23f79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-27  Lutz Mueller <lutz@users.sourceforge.net>
+
+       * configure.ac: AGE = 1
+       * libexif/exif-entry.c (exif_entry_fix): Add a break to avoid unnecessary
+       checks.
+
 2005-04-26  Lutz Mueller <lutz@users.sourceforge.net>
 
        * libexif/exif-entry.c (exif_entry_fix): Leave ' ' untouched, too.

diff --git a/configure.ac b/configure.ac
index f6d9f9f..f4d50db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ dnl  - REVISION (Minor): Increment any time the source changes; set to
 dnl                     0 if you incremented CURRENT.
 dnl  - CURRENT (Major):  Increment if the interface has changes or removals.
 dnl ---------------------------------------------------------------------------
-LIBEXIF_AGE=0
+LIBEXIF_AGE=1
 LIBEXIF_REVISION=0
 LIBEXIF_CURRENT=12
 AC_SUBST([LIBEXIF_AGE])

diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index a6dc9c9..66cb4c2 100644 (file)
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -295,9 +295,13 @@ exif_entry_fix (ExifEntry *e)
                                "Tag 'UserComment' is not empty but does not start with "
                                "format identifyer. This has been fixed.");
                        memcpy (e->data, "ASCII\0\0\0", 8);
+                       break;
                }
 
-               /* First 8 bytes need to follow the specification. */
+               /* 
+                * First 8 bytes need to follow the specification. If they don't, 
+                * assume ASCII.
+                */
                if (memcmp (e->data, "ASCII\0\0\0"     , 8) &&
                    memcmp (e->data, "UNICODE\0"       , 8) &&
                    memcmp (e->data, "JIS\0\0\0\0\0"   , 8) &&