[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=32f7d1d

The following commit has been merged in the master branch:
commit 32f7d1de653ec7839f7fc2547dc7af1d2c827443
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Apr 19 18:44:50 2015 +0000

    #1058.   XMP spec chapter B.4 (page 42) the xml:lang qualifier is to be compared case insensitive.
    https://www.adobe.com/content/dam/Adobe/en/devnet/xmp/pdfs/XMPSpecificationPart1.pdf
---
 include/exiv2/value.hpp | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/include/exiv2/value.hpp b/include/exiv2/value.hpp
index 65fef87..22005ad 100644
--- a/include/exiv2/value.hpp
+++ b/include/exiv2/value.hpp
@@ -872,6 +872,27 @@ namespace Exiv2 {
     }; // class XmpArrayValue
 
     /*!
+      @brief %LangAltValueComparison
+
+      #1058
+	  https://www.adobe.com/content/dam/Adobe/en/devnet/xmp/pdfs/XMPSpecificationPart1.pdf
+	  XMP spec chapter B.4 (page 42) the xml:lang qualifier is to be compared case insensitive.
+      */
+	struct LangAltValueComparator {
+		bool operator() (const std::string& str1, const std::string& str2) const
+		{
+    		bool result = str1.size() != str2.size();
+    		for (std::string::const_iterator c1 = str1.begin()
+    		                               , c2 = str2.begin()
+    		    ; result && c1 != str1.end()
+    		    ; ++c1, ++c2) {
+        			result = tolower(*c1) != tolower(*c2);
+    		}
+    		return result;
+    	}
+	};
+
+    /*!
       @brief %Value type for XMP language alternative properties.
 
       A language alternative is an array consisting of simple text values,
@@ -949,7 +970,7 @@ namespace Exiv2 {
 
     public:
         //! Type used to store language alternative arrays.
-        typedef std::map<std::string, std::string> ValueType;
+        typedef std::map<std::string, std::string,LangAltValueComparator>  ValueType;
         // DATA
         /*!
           @brief Map to store the language alternative values. The language

-- 
exiv2 packaging