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

tag: exif: Check for utf8 before trying to convert

Browse source 
If the string is already on utf8, there is no need to
try to convert it, because it is useless and it might garble
the string.
This commit is contained in:
Thiago Santos 2011-08-11 12:12:07 -03:00
parent 436c533624
commit 72b92af807
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1209,14 +1209,22 @@ parse_exif_ascii_tag (GstExifReader * reader, const GstExifTagMatch * tag,
}
/* convert from ascii to utf8 */
utfstr = g_convert (str, count, "utf8", "latin1", NULL, NULL, &error);
g_free (str);
if (error) {
GST_WARNING ("Skipping tag %d:%s. Failed to convert ascii string "
"to utf8 : %s - %s", tag->exif_tag, tag->gst_tag, str, error->message);
g_error_free (error);
g_free (utfstr);
return;
if (g_utf8_validate (str, -1, NULL)) {
GST_DEBUG ("Exif string is already on utf8: %s", str);
utfstr = str;
} else {
GST_DEBUG ("Exif string isn't utf8, trying to convert from latin1: %s",
str);
utfstr = g_convert (str, count, "utf8", "latin1", NULL, NULL, &error);
g_free (str);
if (error) {
GST_WARNING ("Skipping tag %d:%s. Failed to convert ascii string "
"to utf8 : %s - %s", tag->exif_tag, tag->gst_tag, str,
error->message);
g_error_free (error);
g_free (utfstr);
return;
}
}
tagtype = gst_tag_get_type (tag->gst_tag);