diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:59 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:59 +0200 |
commit | d4af25c52a28b93484ffb55e0a8027bc4ce7856f (patch) | |
tree | 853d57468d6b370711e7a5dd2c3dc7d5bac81b10 /wx+/zlib_wrap.h | |
parent | 5.8 (diff) | |
download | FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.tar.gz FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.tar.bz2 FreeFileSync-d4af25c52a28b93484ffb55e0a8027bc4ce7856f.zip |
5.9
Diffstat (limited to 'wx+/zlib_wrap.h')
-rw-r--r-- | wx+/zlib_wrap.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<size_t>(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<size_t>(uncompressedSize)) throw ZlibInternalError(); } return contOut; |