[eog: 3/11] image: only provide xmp info with HAVE_EXEMPI
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog: 3/11] image: only provide xmp info with HAVE_EXEMPI
- Date: Sat, 12 Feb 2022 18:09:30 +0000 (UTC)
commit 7cbae855a6c0e950bf3fa21e7fb232d141077965
Author: Peter Eisenmann <p3732 getgoogleoff me>
Date: Sun Aug 15 02:07:08 2021 +0200
image: only provide xmp info with HAVE_EXEMPI
src/eog-image.c | 10 ++++------
src/eog-image.h | 2 ++
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/eog-image.c b/src/eog-image.c
index 25c5c814..de444b31 100644
--- a/src/eog-image.c
+++ b/src/eog-image.c
@@ -2160,12 +2160,12 @@ eog_image_get_exif_info (EogImage *img)
}
#endif
+#ifdef HAVE_EXEMPI
/**
* eog_image_get_xmp_info:
* @img: a #EogImage
*
- * Gets the XMP info for @img or NULL if compiled without
- * libexempi support.
+ * Gets the XMP info for @img.
*
* Returns: (transfer full): the xmp data
**/
@@ -2173,21 +2173,19 @@ gpointer
eog_image_get_xmp_info (EogImage *img)
{
gpointer data = NULL;
+ EogImagePrivate *priv;
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
-#ifdef HAVE_EXEMPI
- EogImagePrivate *priv;
priv = img->priv;
g_mutex_lock (&priv->status_mutex);
data = (gpointer) xmp_copy (priv->xmp);
g_mutex_unlock (&priv->status_mutex);
-#endif
return data;
}
-
+#endif
/**
* eog_image_get_file:
diff --git a/src/eog-image.h b/src/eog-image.h
index c6cd1e11..2c7fb9d1 100644
--- a/src/eog-image.h
+++ b/src/eog-image.h
@@ -168,7 +168,9 @@ const gchar *eog_image_get_collate_key (EogImage *img);
ExifData* eog_image_get_exif_info (EogImage *img);
#endif
+#ifdef HAVE_EXEMPI
gpointer eog_image_get_xmp_info (EogImage *img);
+#endif
GFile* eog_image_get_file (EogImage *img);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]