[libexif-cvs] libexif/libexif exif-tag.c,1.62,1.63

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15186/libexif

Modified Files:
	exif-tag.c 
Log Message:
Don't bother calling bindtextdomain in the error case


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -d -r1.62 -r1.63
--- exif-tag.c	8 Nov 2009 06:13:41 -0000	1.62
+++ exif-tag.c	25 Nov 2009 18:50:38 -0000	1.63
@@ -963,14 +963,6 @@ exif_tag_get_title_in_ifd (ExifTag tag, 
 	unsigned int i;
 	int first;
 
-	/* FIXME: This belongs to somewhere else. */
-	/* libexif should use the default system locale.
-	 * If an application specifically requires UTF-8, then we
-	 * must give the application a way to tell libexif that.
-	 * 
-	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	if (ifd >= EXIF_IFD_COUNT)
 		return NULL;
 	first = exif_tag_table_first(tag);
@@ -984,6 +976,14 @@ exif_tag_get_title_in_ifd (ExifTag tag, 
 		} else
 			return NULL; /* Recorded tag not found in the table */
 	}
+	/* FIXME: This belongs to somewhere else. */
+	/* libexif should use the default system locale.
+	 * If an application specifically requires UTF-8, then we
+	 * must give the application a way to tell libexif that.
+	 * 
+	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	 */
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	return _(ExifTagTable[i].title);
 }
 
@@ -993,14 +993,6 @@ exif_tag_get_description_in_ifd (ExifTag
 	unsigned int i;
 	int first;
 
-	/* libexif should use the default system locale.
-	 * If an application specifically requires UTF-8, then we
-	 * must give the application a way to tell libexif that.
-	 * 
-	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-
 	if (ifd >= EXIF_IFD_COUNT)
 		return NULL;
 	first = exif_tag_table_first(tag);
@@ -1018,6 +1010,14 @@ exif_tag_get_description_in_ifd (ExifTag
 	/* GNU gettext acts strangely when given an empty string */
 	if (!ExifTagTable[i].description || !*ExifTagTable[i].description)
 		return "";
+
+	/* libexif should use the default system locale.
+	 * If an application specifically requires UTF-8, then we
+	 * must give the application a way to tell libexif that.
+	 * 
+	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	 */
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	return _(ExifTagTable[i].description);
 }