From d4af25c52a28b93484ffb55e0a8027bc4ce7856f Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:21:59 +0200 Subject: 5.9 --- wx+/zlib_wrap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wx+/zlib_wrap.h') diff --git a/wx+/zlib_wrap.h b/wx+/zlib_wrap.h index 7c805e23..a5ad2cb1 100644 --- a/wx+/zlib_wrap.h +++ b/wx+/zlib_wrap.h @@ -101,7 +101,7 @@ BinContainer decompress(const BinContainer& stream) //throw ZlibInternalError if (uncompressedSize == 0) //cannot be 0: compress() directly maps empty -> empty container skipping zlib! throw ZlibInternalError(); - contOut.resize(uncompressedSize); //throw std::bad_alloc + contOut.resize(static_cast(uncompressedSize)); //throw std::bad_alloc } catch (std::bad_alloc&) //most likely due to data corruption! { @@ -112,7 +112,7 @@ BinContainer decompress(const BinContainer& stream) //throw ZlibInternalError stream.size() - sizeof(uncompressedSize), &*contOut.begin(), uncompressedSize); //throw ZlibInternalError - if (bytesWritten != uncompressedSize) + if (bytesWritten != static_cast(uncompressedSize)) throw ZlibInternalError(); } return contOut; -- cgit