[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=020e227

The following commit has been merged in the master branch:
commit 020e2278212d458ba176e607ca37afda1f675f78
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Jan 3 12:26:01 2011 +0000

    #749: Fixed signature of XmpParser::registerNs that is used when the library is compiled without XMP.
---
 src/xmp.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/xmp.cpp b/src/xmp.cpp
index 746ca49..3fdbb03 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -420,11 +420,10 @@ namespace Exiv2 {
         }
     } // XmpParser::registerNs
 #else
-    bool XmpParser::registerNs(const std::string& /*ns*/,
+    void XmpParser::registerNs(const std::string& /*ns*/,
                                const std::string& /*prefix*/)
     {
         initialize();
-        return true;
     } // XmpParser::registerNs
 #endif
 

-- 
exiv2 packaging