Mercurial > geeqie.yaz

diff src/exif-common.c @ 1667:ece97f3f2305

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for a built without Exiv2 don't try to access XMP metadata if not compiled with Exiv2 some metadata options are valid without Exiv2, do not disable them
author nadvornik
date Tue, 30 Jun 2009 20:12:28 +0000
parents 7cb24fdf07c0
children
line wrap: on
line diff
--- a/src/exif-common.c	Tue Jun 30 19:53:55 2009 +0000
+++ b/src/exif-common.c	Tue Jun 30 20:12:28 2009 +0000
@@ -619,9 +619,14 @@
 	
 	/* CACHE_TYPE_XMP_METADATA file should exist only if the metadata are
 	 * not writable directly, thus it should contain the most up-to-date version */
+	sidecar_path = NULL;
+
+#ifdef HAVE_EXIV2
+	/* we are not able to handle XMP sidecars without exiv2 */
 	sidecar_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path);
 
 	if (!sidecar_path) sidecar_path = file_data_get_sidecar_path(fd, TRUE);
+#endif
 
 	fd->exif = exif_read(fd->path, sidecar_path, fd->modified_xmp);