[gimp] libgimp: more un-deprecating GExiv2.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimp: more un-deprecating GExiv2.
- Date: Thu, 20 Jan 2022 17:46:23 +0000 (UTC)
commit c76172d971abbda74180844c71f92a9e9b3fe4e1
Author: Jehan <jehan girinstud io>
Date: Thu Jan 20 18:43:36 2022 +0100
libgimp: more un-deprecating GExiv2.
Last deprecated usages in this file. Actually there are a few other
calls but deprecated on GExiv2 0.14.0, hence over our current
requirement. So we'll have to handle these later.
libgimp/gimpimagemetadata-save.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/libgimp/gimpimagemetadata-save.c b/libgimp/gimpimagemetadata-save.c
index c23efe8332..c75565ab1a 100644
--- a/libgimp/gimpimagemetadata-save.c
+++ b/libgimp/gimpimagemetadata-save.c
@@ -345,7 +345,7 @@ gimp_image_metadata_copy_tag (GExiv2Metadata *src,
GExiv2Metadata *dest,
const gchar *tag)
{
- gchar **values = gexiv2_metadata_get_tag_multiple (src, tag);
+ gchar **values = gexiv2_metadata_try_get_tag_multiple (src, tag, NULL);
GError *error = NULL;
if (values)
@@ -359,13 +359,22 @@ gimp_image_metadata_copy_tag (GExiv2Metadata *src,
temp_tag = g_strdup (tag);
g_debug ("Copy multi tag %s, first value: %s", temp_tag, values[0]);
- gexiv2_metadata_set_tag_multiple (dest, temp_tag, (const gchar **) values);
+ gexiv2_metadata_try_set_tag_multiple (dest, temp_tag,
+ (const gchar **) values,
+ &error);
+ if (error)
+ {
+ g_warning ("%s: failed to set multiple metadata '%s': %s\n",
+ G_STRFUNC, tag, error->message);
+ g_clear_error (&error);
+ }
+
g_free (temp_tag);
g_strfreev (values);
}
else
{
- gchar *value = gexiv2_metadata_get_tag_string (src, tag);
+ gchar *value = gexiv2_metadata_try_get_tag_string (src, tag, &error);
if (value)
{
@@ -379,6 +388,12 @@ gimp_image_metadata_copy_tag (GExiv2Metadata *src,
}
g_free (value);
}
+ else if (error)
+ {
+ g_warning ("%s: failed to get metadata '%s': %s\n",
+ G_STRFUNC, tag, error->message);
+ g_clear_error (&error);
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]