summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-07-25 23:49:39 +0200
committerinfirit <[email protected]>2014-07-26 12:17:20 +0200
commite00d7e1f2b24ccc0c58b01bc08cb0eb25262fd70 (patch)
tree6eb0ad59282c329898187e52038ed58e8666ea50
parenta6cf3eab819fe90142bfeb719d794f7c6db89feb (diff)
downloadeom-e00d7e1f2b24ccc0c58b01bc08cb0eb25262fd70.tar.bz2
eom-e00d7e1f2b24ccc0c58b01bc08cb0eb25262fd70.tar.xz
Fix build without libexif
Based on eog commits: ebb9e525a84fb169c79908ff646288550f7e480a aa1ceac427d99e70bc2747b4503f6307f4f841e3 From Felix Riemann <[email protected]>
-rw-r--r--src/eom-image.c6
-rw-r--r--src/eom-image.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/eom-image.c b/src/eom-image.c
index 26df136..d723abd 100644
--- a/src/eom-image.c
+++ b/src/eom-image.c
@@ -52,6 +52,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef HAVE_EXIF
+#include "eom-exif-util.h"
#include <libexif/exif-data.h>
#include <libexif/exif-utils.h>
#include <libexif/exif-loader.h>
@@ -1884,6 +1885,7 @@ eom_image_cancel_load (EomImage *img)
g_mutex_unlock (&priv->status_mutex);
}
+#ifdef HAVE_EXIF
EomExifData *
eom_image_get_exif_info (EomImage *img)
{
@@ -1894,18 +1896,16 @@ eom_image_get_exif_info (EomImage *img)
priv = img->priv;
-#ifdef HAVE_EXIF
g_mutex_lock (&priv->status_mutex);
exif_data_ref (priv->exif);
data = priv->exif;
g_mutex_unlock (&priv->status_mutex);
-#endif
return data;
}
-
+#endif
gpointer
eom_image_get_xmp_info (EomImage *img)
diff --git a/src/eom-image.h b/src/eom-image.h
index f88623c..447c37d 100644
--- a/src/eom-image.h
+++ b/src/eom-image.h
@@ -27,7 +27,6 @@
#include "eom-transform.h"
#include "eom-image-save-info.h"
#include "eom-enums.h"
-#include "eom-exif-util.h"
#include <glib.h>
#include <glib-object.h>
@@ -35,6 +34,7 @@
#ifdef HAVE_EXIF
#include <libexif/exif-data.h>
+#include "eom-exif-util.h"
#endif
#ifdef HAVE_LCMS
@@ -169,7 +169,9 @@ const gchar* eom_image_get_caption (EomImage *img);
const gchar *eom_image_get_collate_key (EomImage *img);
+#if HAVE_EXIF
EomExifData* eom_image_get_exif_info (EomImage *img);
+#endif
gpointer eom_image_get_xmp_info (EomImage *img);