[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=3c9c0ed

The following commit has been merged in the master branch:
commit 3c9c0eda35f7e968aec17c54905eb84cabaf762d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Nov 15 13:55:19 2009 +0000

    #653: Merged c1920 from branches/unstable.
---
 xmpsdk/src/XML_Node.cpp | 1 +
 xmpsdk/src/XMPUtils.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xmpsdk/src/XML_Node.cpp b/xmpsdk/src/XML_Node.cpp
index 7cab0ad..8f76d0f 100644
--- a/xmpsdk/src/XML_Node.cpp
+++ b/xmpsdk/src/XML_Node.cpp
@@ -11,6 +11,7 @@
 
 #include <map>
 #include <cstring>
+#include <cstdio>
 
 // ! Can't include XMP..._Impl.hpp - used by both Core and Files.
 #define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
diff --git a/xmpsdk/src/XMPUtils.cpp b/xmpsdk/src/XMPUtils.cpp
index e6a8bd8..5aa13da 100644
--- a/xmpsdk/src/XMPUtils.cpp
+++ b/xmpsdk/src/XMPUtils.cpp
@@ -1172,9 +1172,9 @@ XMPUtils::ConvertToInt ( XMP_StringPtr strValue )
 	XMP_Int32 result;
 	
 	if ( ! XMP_LitNMatch ( strValue, "0x", 2 ) ) {
-		count = sscanf ( strValue, "%d%c", &result, &nextCh );
+            count = sscanf ( strValue, "%d%c", (int*)&result, &nextCh );
 	} else {
-		count = sscanf ( strValue, "%x%c", &result, &nextCh );
+            count = sscanf ( strValue, "%x%c", (unsigned int*)&result, &nextCh );
 	}
 
 	if ( count != 1 ) XMP_Throw ( "Invalid integer string", kXMPErr_BadParam );

-- 
exiv2 packaging