diff --git a/exif/patchs/basicio.cpp.patch b/exif/patchs/basicio.cpp.patch index 0ef5e10..8a0e1e0 100644 --- a/exif/patchs/basicio.cpp.patch +++ b/exif/patchs/basicio.cpp.patch @@ -1,8 +1,8 @@ diff --git a/src/basicio.cpp b/src/basicio.cpp -index 0e99c292..e400ff24 100644 +index 97a481ce..c506485d 100644 --- a/src/basicio.cpp +++ b/src/basicio.cpp -@@ -59,6 +59,64 @@ void ReplaceStringInPlace(std::string& subject, std::string_view search, std::st +@@ -64,6 +64,64 @@ void ReplaceStringInPlace(std::string& subject, std::string_view search, std::st } // namespace namespace Exiv2 { @@ -66,8 +66,8 @@ index 0e99c292..e400ff24 100644 +#endif void BasicIo::readOrThrow(byte* buf, size_t rcount, ErrorCode err) { const size_t nread = read(buf, rcount); - enforce(nread == rcount, err); -@@ -165,7 +223,11 @@ int FileIo::Impl::switchMode(OpMode opMode) { + Internal::enforce(nread == rcount, err); +@@ -170,7 +228,11 @@ int FileIo::Impl::switchMode(OpMode opMode) { } openMode_ = "r+b"; opMode_ = opSeek; @@ -79,7 +79,7 @@ index 0e99c292..e400ff24 100644 if (!fp_) return 1; return std::fseek(fp_, offset, SEEK_SET); -@@ -491,7 +553,11 @@ int FileIo::open(const std::string& mode) { +@@ -501,7 +563,11 @@ int FileIo::open(const std::string& mode) { close(); p_->openMode_ = mode; p_->opMode_ = Impl::opSeek; diff --git a/scripts/build_win_exiv2.bat b/scripts/build_win_exiv2.bat index 1d7bc0a..489bcf3 100644 --- a/scripts/build_win_exiv2.bat +++ b/scripts/build_win_exiv2.bat @@ -10,7 +10,7 @@ IF NOT EXIST cbuild ( CD cbuild || EXIT /B 1 git clone --depth 1 "https://github.com/Exiv2/exiv2" || EXIT /B %ERRORLEVEL% CD exiv2 || EXIT /B %ERRORLEVEL% -git apply -3 %PATCH_DIR%\basicio.cpp.patch || EXIT /B %ERRORLEVEL% +git apply %PATCH_DIR%\basicio.cpp.patch || EXIT /B %ERRORLEVEL% IF NOT EXIST build ( MD build || EXIT /B 1 )