Mercurial > geeqie.yaz

diff src/exiv2.cc @ 686:c0dda0ffb931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.in was rewritten: - uses PKG_CHECK_MODULES everywhere - added --enable-debug (enable debugging support) - added --enable-developer (developer mode, checks depreceated code ...) - removed obsoleted INCLUDES from Makefile.am Fixed src/debug.h (added glib.h). Fixed src/exiv2.c compilation with libexiv2 v0.15. Added src/trash.h to src/Makefile.am (fixed generating 'make dist').
author bruclik
date Mon, 19 May 2008 01:15:17 +0000
parents 6304ba358850
children 0c3f6ef17d18
line wrap: on
line diff
--- a/src/exiv2.cc	Mon May 19 00:54:59 2008 +0000
+++ b/src/exiv2.cc	Mon May 19 01:15:17 2008 +0000
@@ -9,9 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #ifdef HAVE_EXIV2
 
@@ -453,8 +451,11 @@
 		std::stringstream str;
 		Exiv2::Exifdatum *exifdatum;
 		Exiv2::Iptcdatum *iptcdatum;
+#if EXIV2_TEST_VERSION(0,16,0)
 		Exiv2::Xmpdatum *xmpdatum;
-		if ((exifdatum = dynamic_cast<Exiv2::Exifdatum *>(metadatum)))
+#endif
+        
+        if ((exifdatum = dynamic_cast<Exiv2::Exifdatum *>(metadatum)))
 			str << *exifdatum;
 		else if ((iptcdatum = dynamic_cast<Exiv2::Iptcdatum *>(metadatum)))
 			str << *iptcdatum;