2004-09-07 Lutz Mueller <lutz@users.sourceforge.net>

	* libexif/olympus
	* libexif/pentax
	* libexif/canon: Correctly return names, titles and descriptions of
	  tages. Pointed out by Angela Wrobel.

diff --git a/ChangeLog b/ChangeLog
index 5801d55..42dcd54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-09-07  Lutz Mueller <lutz@users.sourceforge.net>
 
+       * libexif/olympus
+       * libexif/pentax
+       * libexif/canon: Correctly return names, titles and descriptions of
+         tages. Pointed out by Angela Wrobel.
+
+2004-09-07  Lutz Mueller <lutz@users.sourceforge.net>
+
        * libexif/exif-entry.c: More guards against malloc returning NULL.
          Problem spotted by Angela Wrobel.
 

diff --git a/libexif/canon/mnote-canon-tag.c b/libexif/canon/mnote-canon-tag.c
index bff6963..e391f8a 100644 (file)
--- a/libexif/canon/mnote-canon-tag.c
+++ b/libexif/canon/mnote-canon-tag.c
@@ -47,7 +47,8 @@ mnote_canon_tag_get_name (MnoteCanonTag t)
 {
        unsigned int i;
 
-       for (i = 0; table[i].name; i++) if (table[i].tag == t) break;
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break;
        return (_(table[i].name));
 }
 
@@ -57,7 +58,8 @@ mnote_canon_tag_get_title (MnoteCanonTag t)
        unsigned int i;
 
        bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR); 
-       for (i = 0; table[i].title; i++) if (table[i].tag == t) break; 
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break; 
        return (_(table[i].title));
 }
 
@@ -67,6 +69,7 @@ mnote_canon_tag_get_description (MnoteCanonTag t)
        unsigned int i;
 
        bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
-       for (i = 0; table[i].description; i++) if (table[i].tag == t) break;
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break;
        return (_(table[i].description));
 }

diff --git a/libexif/olympus/exif-mnote-data-olympus.c b/libexif/olympus/exif-mnote-data-olympus.c
index 33f08a3..e370f15 100644 (file)
--- a/libexif/olympus/exif-mnote-data-olympus.c
+++ b/libexif/olympus/exif-mnote-data-olympus.c
@@ -325,7 +325,7 @@ exif_mnote_data_olympus_get_name (ExifMnoteData *d, unsigned int i)
 
        if (!n) return NULL;
        if (i >= n->count) return NULL;
-       return mnote_olympus_tag_get_title (n->entries[i].tag);
+       return mnote_olympus_tag_get_name (n->entries[i].tag);
 }
 
 static const char *

diff --git a/libexif/olympus/mnote-olympus-tag.c b/libexif/olympus/mnote-olympus-tag.c
index 606d718..818ee78 100644 (file)
--- a/libexif/olympus/mnote-olympus-tag.c
+++ b/libexif/olympus/mnote-olympus-tag.c
@@ -65,8 +65,8 @@ static struct {
        {MNOTE_NIKON_TAG_FLASHUSED,       "FLASHUSED", N_("Flash used"), NULL},
        {MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFOCUSPOSITION", N_("AF Focus position"), NULL},
        {MNOTE_NIKON_TAG_BRACKETING,      "BRACKETING", N_("Bracketing"), NULL},
-       {MNOTE_NIKON_TAG_UNKNOWN_0X008A,  "UNKNOWN_0X008A", N_("0x008a"), NULL},
-       {MNOTE_NIKON_TAG_UNKNOWN_0X008B,  "UNKNOWN_0X008B", N_("0x008b"), NULL},
+       {MNOTE_NIKON_TAG_UNKNOWN_0X008A,  NULL, NULL, NULL},
+       {MNOTE_NIKON_TAG_UNKNOWN_0X008B,  NULL, NULL, NULL},
        {MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast curve"), NULL},
        {MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Colormode"), NULL},
        {MNOTE_NIKON_TAG_LIGHTYPE,        "LIGHTYPE,", N_("Lightype"), NULL},
@@ -127,7 +127,8 @@ mnote_olympus_tag_get_name (MnoteOlympusTag t)
 {
        unsigned int i;
 
-       for (i = 0; table[i].name; i++) if (table[i].tag == t) break;
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break;
        return (table[i].name);
 }
 
@@ -137,7 +138,8 @@ mnote_olympus_tag_get_title (MnoteOlympusTag t)
        unsigned int i;
 
        bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
-       for (i = 0; table[i].title; i++) if (table[i].tag == t) break;
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break;
        return (_(table[i].title));
 }
 
@@ -147,7 +149,8 @@ mnote_olympus_tag_get_description (MnoteOlympusTag t)
        unsigned int i;
 
        bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
-       for (i = 0; table[i].description; i++) if (table[i].tag == t) break;
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break;
        if (!table[i].description) return NULL;
        return (_(table[i].description));
 }

diff --git a/libexif/pentax/mnote-pentax-tag.c b/libexif/pentax/mnote-pentax-tag.c
index 9f4c14a..664ed69 100644 (file)
--- a/libexif/pentax/mnote-pentax-tag.c
+++ b/libexif/pentax/mnote-pentax-tag.c
@@ -66,7 +66,8 @@ mnote_pentax_tag_get_name (MnotePentaxTag t)
 {
        unsigned int i;
 
-       for (i = 0; table[i].name; i++) if (table[i].tag == t) break;
+       for (i = 0; sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break;
        return (table[i].name);
 }
 
@@ -76,7 +77,8 @@ mnote_pentax_tag_get_title (MnotePentaxTag t)
        unsigned int i;
 
        bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
-       for (i = 0; table[i].title; i++) if (table[i].tag == t) break; 
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break; 
        return (_(table[i].title));
 }
 
@@ -86,6 +88,7 @@ mnote_pentax_tag_get_description (MnotePentaxTag t)
        unsigned int i;
 
        bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
-       for (i = 0; table[i].description; i++) if (table[i].tag == t) break;
+       for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+               if (table[i].tag == t) break;
        return (_(table[i].description));
 }