From e628f8e057558708d27cd852fcf010efd3743d06 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Mon, 24 Aug 2015 10:02:17 +0000 Subject: [PATCH] Correction to r3981. Only build this functionality when EXV_HAVE_XMP_TOOLKIT is enabled. --- src/version.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/version.cpp b/src/version.cpp index 3561942b..ca91320e 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -67,7 +67,6 @@ EXIV2_RCSID("@(#) $Id$") # define TXMP_STRING_TYPE std::string # include # include -#endif // EXV_HAVE_XMP_TOOLKIT #include "xmp.hpp" static XMP_Status namespaceDumper ( void* /*refCon*/ @@ -90,6 +89,7 @@ static XMP_Status namespaceDumper ( void* /*refCon*/ } return result; } +#endif // EXV_HAVE_XMP_TOOLKIT namespace Exiv2 { int versionNumber() @@ -543,8 +543,10 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys) output(os,keys,"enable_video" ,enable_video ); output(os,keys,"enable_webready" ,enable_webready ); +#ifdef EXV_HAVE_XMP_TOOLKIT Exiv2::XmpParser::initialize(); SXMPMeta::DumpNamespaces(namespaceDumper,NULL); +#endif #if defined(__linux__) dlclose(ph);