[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=50def5c

The following commit has been merged in the master branch:
commit 50def5c02d6106fd59bb8ef5ada8a46610c809f8
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Jul 20 19:23:56 2016 +0000

    #1189 Code change provided by private email from Taras.  Thank You Taras.
---
 src/properties.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index 1e8906f..14edb77 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -2509,7 +2509,7 @@ namespace Exiv2 {
                                    const std::string& prefix)
     {
         Internal::ScopedWriteLock swl(rwLock_);
-        
+
         std::string ns2 = ns;
         if (   ns2.substr(ns2.size() - 1, 1) != "/"
             && ns2.substr(ns2.size() - 1, 1) != "#") ns2 += "/";
@@ -2558,7 +2558,7 @@ namespace Exiv2 {
     void XmpProperties::unregisterNs()
     {
         Internal::ScopedWriteLock swl(rwLock_);
-        
+
         NsRegistry::iterator i = nsRegistry_.begin();
         while (i != nsRegistry_.end()) {
             NsRegistry::iterator kill = i++;
@@ -2659,7 +2659,6 @@ namespace Exiv2 {
 
     const XmpNsInfo* XmpProperties::nsInfoUnsafe(const std::string& prefix)
     {
-        Internal::ScopedReadLock srl(rwLock_);
         const XmpNsInfo::Prefix pf(prefix);
         const XmpNsInfo* xn = lookupNsRegistryUnsafe(pf);
         if (!xn) xn = find(xmpNsInfo, pf);

-- 
exiv2 packaging