mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

tag: exiftag: don't try to convert utf-8 to latin1 if string is ASCII already

Browse source 
Bypass g_convert/iconv if there's nothing to convert. That way,
conversion won't fail on systems where iconv doesn't support
converting utf-8 to latin1 and there's nothing to convert.

https://bugzilla.gnome.org/show_bug.cgi?id=723252
This commit is contained in:
Tim-Philipp Müller 2015-04-03 21:00:53 +01:00
parent 5b7505a018
commit 99929b7ffa
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/tag/gstexiftag.c
View file

@ -801,6 +801,20 @@ write_exif_undefined_tag (GstExifWriter * writer, guint16 tag,
}
}
static inline gboolean
gst_exif_tag_str_is_ascii (const gchar * str, gsize * length)
{
gsize len = 0;
while (*str) {
if (*str++ & 0x80)
return FALSE;
++len;
}
*length = len;
return TRUE;
}
static void
write_exif_ascii_tag (GstExifWriter * writer, guint16 tag, const gchar * str)
{
@ -809,7 +823,11 @@ write_exif_ascii_tag (GstExifWriter * writer, guint16 tag, const gchar * str)
gsize ascii_size;
GError *error = NULL;
ascii_str = g_convert (str, -1, "latin1", "utf8", NULL, &ascii_size, &error);
if (gst_exif_tag_str_is_ascii (str, &ascii_size))
ascii_str = g_strndup (str, ascii_size);
else
ascii_str =
g_convert (str, -1, "latin1", "utf8", NULL, &ascii_size, &error);
if (error) {
GST_WARNING ("Failed to convert exif tag to ascii: 0x%x - %s. Error: %s",