diff --git a/include/exiv2/futils.hpp b/include/exiv2/futils.hpp index d31687b4..6a9a6167 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 #include #include #include // for UINT_MAX diff --git a/src/futils.cpp b/src/futils.cpp index bc30cba0..607e835c 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); }