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

The following commit has been merged in the master branch:
commit fd1852da84db35dbb9d07010434c790882c0f75f
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Apr 27 21:25:30 2015 +0000

    #922.  Fix Linux build breaker and MSVC compilation warnings.
---
 src/image.cpp    | 1 +
 src/pngimage.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index 620f190..5d11a03 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -72,6 +72,7 @@ EXIV2_RCSID("@(#) $Id$")
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdarg.h>
 #ifdef _MSC_VER
 # define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
 #endif
diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index 95431d0..ea073ef 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -137,8 +137,8 @@ namespace Exiv2 {
                     chType[i-4]=cheaderBuf.pData_[i];
                 }
 
-                size_t      blen = 32   ;
-                size_t      dOff = dataOffset;
+                uint32_t    blen = 32   ;
+                uint32_t    dOff = dataOffset;
                 std::string dataString ;
 
                 if ( dataOffset > blen ) {
@@ -152,7 +152,7 @@ namespace Exiv2 {
 
                 // for XMP, back up and read the whole block
                 const char* key = "XML:com.adobe.xmp" ;
-                int       start = ::strlen(key);
+                size_t      start = ::strlen(key);
 
                 if ( option == kpsXMP && dataString.find(key)==0 ) {
 #if defined(_MSC_VER)

-- 
exiv2 packaging