[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:37 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=e628f8e
The following commit has been merged in the master branch:
commit e628f8e057558708d27cd852fcf010efd3743d06
Author: Robin Mills <robin at clanmills.com>
Date: Mon Aug 24 10:02:17 2015 +0000
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 3561942..ca91320 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -67,7 +67,6 @@ EXIV2_RCSID("@(#) $Id$")
# define TXMP_STRING_TYPE std::string
# include <XMPSDK.hpp>
# include <XMP.incl_cpp>
-#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);
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list