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

The following commit has been merged in the master branch:
commit ed89a70db377464bb135f8fe3dc16aaec8f17aca
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Apr 17 03:55:08 2008 +0000

    Fixed compilation error when configuration flag --disable-xmp is used.
---
 src/xmp.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/xmp.cpp b/src/xmp.cpp
index c03acd3..c4377ed 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -388,10 +388,10 @@ namespace Exiv2 {
         }
     }
 
+#ifdef EXV_HAVE_XMP_TOOLKIT
     bool XmpParser::registerNs(const std::string& ns, 
                                const std::string& prefix)
     {
-#ifdef EXV_HAVE_XMP_TOOLKIT
         try {
             initialize();
             return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
@@ -399,11 +399,15 @@ namespace Exiv2 {
         catch (const XMP_Error& e) {
             throw Error(40, e.GetID(), e.GetErrMsg());
         }
+    } // XmpParser::registerNs
 #else
+    bool XmpParser::registerNs(const std::string& /*ns*/, 
+                               const std::string& /*prefix*/)
+    {
         initialize();
         return true;
-#endif
     } // XmpParser::registerNs
+#endif
 
     void XmpParser::unregisterNs(const std::string& /*ns*/)
     {
@@ -663,8 +667,10 @@ namespace Exiv2 {
         return 3;
     }} // XmpParser::decode
 #else
-    int XmpParser::encode(      std::string& xmpPacket,
-                          const XmpData&     xmpData)
+    int XmpParser::encode(      std::string& /*xmpPacket*/,
+                          const XmpData&     xmpData,
+                                uint16_t     /*formatFlags*/,
+                                uint32_t     /*padding*/)
     {
         if (!xmpData.empty()) {
 #ifndef SUPPRESS_WARNINGS

-- 
exiv2 packaging