[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=523fdc3

The following commit has been merged in the master branch:
commit 523fdc3e103086b21a3e639dd2cf9917e5f3ed27
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Oct 6 04:18:50 2007 +0000

    Fixed some g++ warnings (ported from Exempi 1.99.4).
---
 xmpsdk/src/XMPCore_Impl.cpp | 1 +
 xmpsdk/src/XMPCore_Impl.hpp | 2 +-
 xmpsdk/src/XMPIterator.cpp  | 6 +++---
 xmpsdk/src/XMPMeta.cpp      | 4 ++--
 xmpsdk/src/XMPMeta.hpp      | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/xmpsdk/src/XMPCore_Impl.cpp b/xmpsdk/src/XMPCore_Impl.cpp
index 32687ee..d652ee2 100644
--- a/xmpsdk/src/XMPCore_Impl.cpp
+++ b/xmpsdk/src/XMPCore_Impl.cpp
@@ -684,6 +684,7 @@ ExpandXPath	( XMP_StringPtr			schemaNS,
 	XMP_StringPtr	qualName, nameEnd;
 	XMP_VarString	currStep;
 		
+	qualName = nameEnd = NULL;
 	size_t resCount = 2;	// Guess at the number of steps. At least 2, plus 1 for each '/' or '['.
 	for ( stepEnd = propPath; *stepEnd != 0; ++stepEnd ) {
 		if ( (*stepEnd == '/') || (*stepEnd == '[') ) ++resCount;
diff --git a/xmpsdk/src/XMPCore_Impl.hpp b/xmpsdk/src/XMPCore_Impl.hpp
index 5afc577..27c2c37 100644
--- a/xmpsdk/src/XMPCore_Impl.hpp
+++ b/xmpsdk/src/XMPCore_Impl.hpp
@@ -122,7 +122,7 @@ extern WXMP_Result		void_wResult;
 						          (XMP_API_VERSION_MINOR << 16) |	\
 						          (XMP_API_VERSION_MICRO << 8) )
 
-	#define kXMPCoreName "XMP Core"
+	#define kXMPCoreName "XMP Core (Exiv2)"
 	#define kXMPCore_VersionMessage	kXMPCoreName " " XMP_API_VERSION_STRING
 // =================================================================================================
 // Support for asserts
diff --git a/xmpsdk/src/XMPIterator.cpp b/xmpsdk/src/XMPIterator.cpp
index 8032bfa..034c079 100644
--- a/xmpsdk/src/XMPIterator.cpp
+++ b/xmpsdk/src/XMPIterator.cpp
@@ -156,7 +156,7 @@ AddNodeOffspring ( IterInfo & info, IterNode & iterParent, const XMP_Node * xmpP
 				currPath += xmpChild->name;
 			} else {
 				char buffer [32];	// AUDIT: Using sizeof(buffer) below for snprintf length is safe.
-				snprintf ( buffer, sizeof(buffer), "[%d]", childNum+1 );	// ! XPath indices are one-based.
+				snprintf ( buffer, sizeof(buffer), "[%u]", childNum+1 );	// ! XPath indices are one-based.
 				currPath += buffer;
 			}
 			iterParent.children.push_back ( IterNode ( xmpChild->options, currPath, leafOffset ) );
@@ -422,7 +422,7 @@ XMPIterator::Unlock	( XMP_OptionBits options )
 XMPIterator::XMPIterator ( const XMPMeta & xmpObj,
 						   XMP_StringPtr   schemaNS,
 						   XMP_StringPtr   propName,
-						   XMP_OptionBits  options ) : info(IterInfo(options,&xmpObj)), clientRefs(0)
+						   XMP_OptionBits  options ) : clientRefs(0), info(IterInfo(options,&xmpObj))
 {
 	if ( (options & kXMP_IterClassMask) != kXMP_IterProperties ) {
 		XMP_Throw ( "Unsupported iteration kind", kXMPErr_BadOptions );
@@ -574,7 +574,7 @@ XMPIterator::XMPIterator ( const XMPMeta & xmpObj,
 
 XMPIterator::XMPIterator ( XMP_StringPtr  schemaNS,
 						   XMP_StringPtr  propName,
-						   XMP_OptionBits options ) : info(IterInfo(options,0)), clientRefs(0)
+						   XMP_OptionBits options ) : clientRefs(0), info(IterInfo(options,0))
 {
 
 	XMP_Throw ( "Unimplemented XMPIterator constructor for global tables", kXMPErr_Unimplemented );
diff --git a/xmpsdk/src/XMPMeta.cpp b/xmpsdk/src/XMPMeta.cpp
index 888d48e..765a40e 100644
--- a/xmpsdk/src/XMPMeta.cpp
+++ b/xmpsdk/src/XMPMeta.cpp
@@ -79,7 +79,7 @@ static const char * kTenSpaces = "          ";
 #define OutProcDecInt(num)	{ snprintf ( buffer, sizeof(buffer), "%d", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
 							  status = (*outProc) ( refCon, buffer, strlen(buffer) );  if ( status != 0 ) goto EXIT; }
 
-#define OutProcHexInt(num)	{ snprintf ( buffer, sizeof(buffer), "%X", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
+#define OutProcHexInt(num)	{ snprintf ( buffer, sizeof(buffer), "%lX", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
 							  status = (*outProc) ( refCon, buffer, strlen(buffer) );  if ( status != 0 ) goto EXIT; }
 
 static const char * kIndent = "   ";
@@ -413,7 +413,7 @@ static void DumpXMLTree ( FILE * log, const XML_Node & node, int indent )
 // ============
 
 
-XMPMeta::XMPMeta() : tree(XMP_Node(0,"",0)), clientRefs(0), prevTkVer(0), xmlParser(0)
+XMPMeta::XMPMeta() : clientRefs(0), prevTkVer(0), tree(XMP_Node(0,"",0)), xmlParser(0)
 {
 	// Nothing more to do, clientRefs is incremented in wrapper.
 	#if XMP_TraceCTorDTor
diff --git a/xmpsdk/src/XMPMeta.hpp b/xmpsdk/src/XMPMeta.hpp
index a73eb6a..6364668 100644
--- a/xmpsdk/src/XMPMeta.hpp
+++ b/xmpsdk/src/XMPMeta.hpp
@@ -401,7 +401,7 @@ public:
 private:
   
 	// ! These are hidden on purpose:
-	XMPMeta ( const XMPMeta & /* original */ ) : tree(XMP_Node(0,"",0)), clientRefs(0), prevTkVer(0), xmlParser(0)
+	XMPMeta ( const XMPMeta & /* original */ ) : clientRefs(0), prevTkVer(0), tree(XMP_Node(0,"",0)), xmlParser(0)
 		{ XMP_Throw ( "Call to hidden constructor", kXMPErr_InternalFailure ); };
 	void operator= ( const XMPMeta & /* rhs */ )  
 		{ XMP_Throw ( "Call to hidden operator=", kXMPErr_InternalFailure ); };

-- 
exiv2 packaging