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

The following commit has been merged in the master branch:
commit f2abf92fd70dcec51f3e8e1a0e310f6b3a7c7297
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Jan 2 09:17:56 2015 +0000

    #1013 and #1015.  Thank You, Thomas, for reporting these and for the fixes.
---
 include/exiv2/futils.hpp | 2 +-
 src/futils.cpp           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/exiv2/futils.hpp b/include/exiv2/futils.hpp
index d31687b..6a9a616 100644
--- a/include/exiv2/futils.hpp
+++ b/include/exiv2/futils.hpp
@@ -33,6 +33,7 @@
 // *********************************************************************
 // included header files
 #include "config.h"
+#include "types.hpp"
 
 #define UNUSED(x) (void)(x)
 
@@ -41,7 +42,6 @@
 #endif
 
 // + standard includes
-#include <types.hpp>
 #include <string>
 #include <map>
 #include <limits.h>						 // for UINT_MAX
diff --git a/src/futils.cpp b/src/futils.cpp
index bc30cba..607e835 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -319,7 +319,7 @@ namespace Exiv2 {
 #ifdef EXV_UNICODE_PATH
     std::wstring pathOfFileUrl(const std::wstring& wurl) {
         std::wstring path = wurl.substr(7);
-        int found = path.find('/');
+        size_t found = path.find('/');
         if (found == std::wstring::npos) return path;
         else return path.substr(found);
     }

-- 
exiv2 packaging