GNU gettext behaves strangely when given an empty string, so make sure

not to do that.

diff --git a/libexif/canon/mnote-canon-tag.c b/libexif/canon/mnote-canon-tag.c
index 2c8b4e2..e4278a1 100644 (file)
--- a/libexif/canon/mnote-canon-tag.c
+++ b/libexif/canon/mnote-canon-tag.c
@@ -192,6 +192,10 @@ mnote_canon_tag_get_description (MnoteCanonTag t)
 
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-               if (table[i].tag == t) return (_(table[i].description));
+               if (table[i].tag == t) {
+                       if (!*table[i].description)
+                               return "";
+                       return (_(table[i].description));
+               }
        return NULL;
 }

diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index 97a837d..46073c2 100644 (file)
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -976,6 +976,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
                for (j = 0; list[i].strings[j] && (j < v_short); j++);
                if (!list[i].strings[j])
                        snprintf (val, maxlen, "%i", v_short);
+               else if (!*list[i].strings[j])
+                       val[0] = 0;
                else
                        strncpy (val, _(list[i].strings[j]), maxlen);
                break;

diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c
index edc222c..9d69847 100644 (file)
--- a/libexif/exif-tag.c
+++ b/libexif/exif-tag.c
@@ -760,8 +760,13 @@ exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
 
        if (ifd >= EXIF_IFD_COUNT) return NULL;
        for (i = 0; ExifTagTable[i].description; i++)
-               if ((ExifTagTable[i].tag == tag) && RECORDED) break;
-       return _(ExifTagTable[i].description);
+               if ((ExifTagTable[i].tag == tag) && RECORDED) {
+                       /* GNU gettext acts strangely when given an empty string */
+                       if (!*ExifTagTable[i].description)
+                               return "";
+                       return _(ExifTagTable[i].description);
+               }
+       return NULL;
 }
 
 

diff --git a/libexif/fuji/mnote-fuji-tag.c b/libexif/fuji/mnote-fuji-tag.c
index cd39da4..8fe9a8f 100644 (file)
--- a/libexif/fuji/mnote-fuji-tag.c
+++ b/libexif/fuji/mnote-fuji-tag.c
@@ -96,6 +96,10 @@ mnote_fuji_tag_get_description (MnoteFujiTag t)
 
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-               if (table[i].tag == t) return (_(table[i].description));
+               if (table[i].tag == t) {
+                       if (!*table[i].description)
+                               return "";
+                       return (_(table[i].description));
+               }
        return NULL;
 }

diff --git a/libexif/olympus/mnote-olympus-tag.c b/libexif/olympus/mnote-olympus-tag.c
index 2eb76eb..028c1dc 100644 (file)
--- a/libexif/olympus/mnote-olympus-tag.c
+++ b/libexif/olympus/mnote-olympus-tag.c
@@ -214,6 +214,10 @@ mnote_olympus_tag_get_description (MnoteOlympusTag t)
 
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-               if (table[i].tag == t) return (_(table[i].description));
+               if (table[i].tag == t) {
+                       if (!*table[i].description)
+                               return "";
+                       return (_(table[i].description));
+               }
        return NULL;
 }

diff --git a/libexif/pentax/mnote-pentax-tag.c b/libexif/pentax/mnote-pentax-tag.c
index 9a02293..6243286 100644 (file)
--- a/libexif/pentax/mnote-pentax-tag.c
+++ b/libexif/pentax/mnote-pentax-tag.c
@@ -103,6 +103,10 @@ mnote_pentax_tag_get_description (MnotePentaxTag t)
 
        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-               if (table[i].tag == t) return (_(table[i].description));
+               if (table[i].tag == t) {
+                       if (!*table[i].description)
+                               return "";
+                       return (_(table[i].description));
+               }
        return NULL;
 }