[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f87a839

The following commit has been merged in the master branch:
commit f87a83978dccedc5f0454c12db29b5080efd0154
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Aug 24 09:45:10 2015 +0000

    exiv2 -vV lists registered Namespaces.  #640 and topic 2169 http://dev.exiv2.org/boards/3/topics/2169
---
 src/version.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/version.cpp b/src/version.cpp
index 5da0e6d..3561942 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -60,6 +60,37 @@ EXIV2_RCSID("@(#) $Id$")
 #include <vector>
 #include <stdio.h>
 
+#include <iostream>
+
+// Adobe XMP Toolkit
+#ifdef EXV_HAVE_XMP_TOOLKIT
+# 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*/
+                  , XMP_StringPtr buffer
+                  , XMP_StringLen bufferSize
+) {
+	XMP_Status result = 0 ;
+	std::string out(buffer,bufferSize);
+	// remove blanks
+	// http://stackoverflow.com/questions/83439/remove-spaces-from-stdstring-in-c
+	std::string::iterator end_pos = std::remove(out.begin(), out.end(), ' ');
+	out.erase(end_pos, out.end());
+
+	bool bHttp = out.find("http://") != std::string::npos ;
+	bool bNS   = out.find(":") != std::string::npos && !bHttp;
+	if ( bHttp || bNS ) {
+		if ( bNS )   std::cout << "xmlns=" ;
+		             std::cout <<  out     ;
+		if ( bHttp ) std::cout << std::endl;
+	}
+	return     result;
+}
+
 namespace Exiv2 {
     int versionNumber()
     {
@@ -512,6 +543,9 @@ 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  );
 
+    Exiv2::XmpParser::initialize();
+    SXMPMeta::DumpNamespaces(namespaceDumper,NULL);
+
 #if defined(__linux__)
     dlclose(ph);
     ph=NULL;

-- 
exiv2 packaging