[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.17,1.18 mnote-olympus-tag.c,1.6,1.7

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14941/libexif/olympus

Modified Files:
	exif-mnote-data-olympus.c mnote-olympus-tag.c 
Log Message:

2004-09-07  Lutz Mueller <lu...@us...>

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


Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mnote-olympus-tag.c	1 Sep 2004 06:16:56 -0000	1.6
+++ mnote-olympus-tag.c	7 Sep 2004 06:33:54 -0000	1.7
@@ -65,8 +65,8 @@
 	{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 @@
 {
 	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 @@
 	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 @@
 	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));
 }

Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- exif-mnote-data-olympus.c	26 Aug 2004 20:08:09 -0000	1.17
+++ exif-mnote-data-olympus.c	7 Sep 2004 06:33:54 -0000	1.18
@@ -325,7 +325,7 @@
 
 	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 *