[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=f89d282

The following commit has been merged in the master branch:
commit f89d2821fe2b7e855db0db4fcafd767a3e04660c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Oct 19 08:32:15 2011 +0000

    Fixed g++ 4.6.1 (Debian) compiler warnings.
---
 xmpsdk/src/XMPIterator.cpp       |  7 +++----
 xmpsdk/src/XMPMeta-Serialize.cpp |  4 ++--
 xmpsdk/src/XMPMeta.cpp           | 13 +++++--------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/xmpsdk/src/XMPIterator.cpp b/xmpsdk/src/XMPIterator.cpp
index e2c74cc..8ae756d 100644
--- a/xmpsdk/src/XMPIterator.cpp
+++ b/xmpsdk/src/XMPIterator.cpp
@@ -574,13 +574,12 @@ XMPIterator::XMPIterator ( const XMPMeta & xmpObj,
 //
 // Constructor for iterations over global tables such as registered namespaces or aliases.
 
-XMPIterator::XMPIterator ( XMP_StringPtr  schemaNS,
-						   XMP_StringPtr  propName,
-						   XMP_OptionBits options ) : clientRefs(0), info(IterInfo(options,0))
+XMPIterator::XMPIterator ( XMP_StringPtr  /*schemaNS*/,
+                           XMP_StringPtr  /*propName*/,
+                           XMP_OptionBits options ) : clientRefs(0), info(IterInfo(options,0))
 {
 
 	XMP_Throw ( "Unimplemented XMPIterator constructor for global tables", kXMPErr_Unimplemented );
-		void * p; p = &schemaNS; p = &propName; p = &options;	// Avoid unused param warnings.
 
 }	// XMPIterator for global tables
 
diff --git a/xmpsdk/src/XMPMeta-Serialize.cpp b/xmpsdk/src/XMPMeta-Serialize.cpp
index 215cdb3..56dfc29 100644
--- a/xmpsdk/src/XMPMeta-Serialize.cpp
+++ b/xmpsdk/src/XMPMeta-Serialize.cpp
@@ -1292,11 +1292,11 @@ XMPMeta::SerializeToBuffer ( XMP_StringPtr * rdfString,
 		} else {
 
 			std::string padStr ( "    " );  padStr[0] = padStr[1] = padStr[2] = 0;	// Assume big endian.
-			UTF8_to_UTF32_Proc Converter = UTF8_to_UTF32BE;
+//			UTF8_to_UTF32_Proc Converter = UTF8_to_UTF32BE;
 
 			if ( charEncoding & _XMP_LittleEndian_Bit ) {
 				padStr[0] = ' '; padStr[1] = padStr[2] = padStr[3] = 0;
-				Converter = UTF8_to_UTF32LE;
+//				Converter = UTF8_to_UTF32LE;
 			}
 			
 			utf8Str.swap ( *sOutputStr );
diff --git a/xmpsdk/src/XMPMeta.cpp b/xmpsdk/src/XMPMeta.cpp
index 909f86f..f55a3b9 100644
--- a/xmpsdk/src/XMPMeta.cpp
+++ b/xmpsdk/src/XMPMeta.cpp
@@ -1019,11 +1019,10 @@ XMPMeta::GetGlobalOptions()
 // ----------------
 
 /* class-static */ void
-XMPMeta::SetGlobalOptions ( XMP_OptionBits options )
+XMPMeta::SetGlobalOptions ( XMP_OptionBits /*options*/ )
 {
 
 	XMP_Throw ( "Unimplemented method XMPMeta::SetGlobalOptions", kXMPErr_Unimplemented );
-		void * p; p = &options;	// Avoid unused param warnings.
 
 }	// SetGlobalOptions
 
@@ -1328,13 +1327,12 @@ XMPMeta::ResolveAlias ( XMP_StringPtr	 aliasNS,
 // -----------
 
 /* class-static */ void
-XMPMeta::DeleteAlias ( XMP_StringPtr aliasNS,
-					   XMP_StringPtr aliasProp )
+XMPMeta::DeleteAlias ( XMP_StringPtr /*aliasNS*/,
+                       XMP_StringPtr /*aliasProp*/ )
 {
 
-	XMP_Assert ( (aliasNS != 0) && (aliasProp != 0) );	// Enforced by wrapper.
+//	Todo: XMP_Assert ( (aliasNS != 0) && (aliasProp != 0) );	/ / Enforced by wrapper.
 	XMP_Throw ( "Unimplemented method XMPMeta::DeleteAlias", kXMPErr_Unimplemented );   // *** #error "write me"
-		void * p; p = &aliasNS; p = &aliasProp;	// Avoid unused param warnings.
 
 }	// DeleteAlias
 
@@ -1567,11 +1565,10 @@ XMPMeta::GetObjectOptions() const
 // ----------------
 
 void
-XMPMeta::SetObjectOptions ( XMP_OptionBits options )
+XMPMeta::SetObjectOptions ( XMP_OptionBits /*options*/ )
 {
 
 	XMP_Throw ( "Unimplemented method XMPMeta::SetObjectOptions", kXMPErr_Unimplemented );
-		void * p; p = &options;	// Avoid unused param warnings.
 
 }	// SetObjectOptions
 

-- 
exiv2 packaging