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

The following commit has been merged in the master branch:
commit 416221118a9ac20c64c9863e3558a123651ce0d7
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 23 13:06:08 2015 +0000

    Fix Visual Studio 2015 build.
---
 src/localtime.c | 4 +++-
 src/version.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/localtime.c b/src/localtime.c
index 959ec2b..9e188cd 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -3,7 +3,9 @@
   @brief   This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
   @version $Rev$
 */
-
+#ifdef  _MSC_VER
+#define tzname _tzname
+#endif
 
 #include "config.h"
 #include "timegm.h"
diff --git a/src/version.cpp b/src/version.cpp
index 40d7b18..ddbbdc8 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -202,10 +202,10 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
     sprintf(version,"%d.%02d",(_MSC_VER-600)/100,_MSC_VER%100);
 
     // add edition in brackets
-    int   edition             = (_MSC_VER-600)/100; // 7.1 = 2003 ... 14 = 2015
-    const char* editions[]    = { "2003", "2005", "2008", "2010", "2012","2013","no version 13","2015"};
-    if  ( edition < 7 || edition > 14 ) edition = 0 ;
-    if  ( edition ) sprintf(version+::strlen(version)," (%s)",editions[edition-7] );
+    int   edition             = (_MSC_VER-600)/100; // 7.1 = 2003 ... 12 = 2013
+    const char* editions[]    = { "0","1","2","3","4","5","6","2003", "2005", "2008", "2010", "2012","2013","2015"};
+    if  ( edition > lengthof(editions) ) edition = 0 ;
+    if  ( edition ) sprintf(version+::strlen(version)," (%s)",editions[edition] );
 #define __VERSION__ version
 #endif
 

-- 
exiv2 packaging