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

The following commit has been merged in the master branch:
commit af2f46c8b731d4b23867a767355044ef2bd9206f
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Apr 25 20:43:31 2015 +0000

    #1065.  std::map<int,const char*> doesn't build on MacOS-X 10.6 (Snow Leopard).  Thanks Max for letting me know about this.
---
 src/tiffimage.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index ae95c5e..6dc30d5 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -412,12 +412,12 @@ namespace Exiv2 {
 		return result;
     }
 
-    static const char* tagName(uint16_t tag,int nMaxLength)
+    static const char* tagName(uint16_t tag,size_t nMaxLength)
     {
-    	const char*    result = NULL;
+    	const char* result = NULL;
 
     	// build a static map of tags for fast search
-    	static std::map<int,const char*> tags;
+    	static std::map<int,std::string> tags;
         static bool init  = true;
         static char buffer[80];
 
@@ -433,7 +433,7 @@ namespace Exiv2 {
         init = false;
 
         try {
-        	result = tags[tag];
+        	result = tags[tag].c_str();
         	if ( nMaxLength > sizeof(buffer) )
         		nMaxLength = sizeof(buffer) - 2;
         	strncpy(buffer,result,nMaxLength);

-- 
exiv2 packaging