games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

vcmi: modernize lib/filesystem

Browse Source
This commit is contained in:
Konstantin
2023-02-15 01:09:07 +03:00
parent c142bf1072
commit 462599a5c6
18 changed files with 112 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/filesystem/CCompressedStream.cpp
View File

@@ -26,7 +26,7 @@ si64 CBufferedStream::read(ui8 * data, si64 size)
{
ensureSize(position + size);
auto start = buffer.data() + position;
auto * start = buffer.data() + position;
si64 toRead = std::min<si64>(size, buffer.size() - position);
std::copy(start, start + toRead, data);
@@ -62,7 +62,7 @@ si64 CBufferedStream::getSize()
void CBufferedStream::ensureSize(si64 size)
{
while ((si64)buffer.size() < size && !endOfFileReached)
while(static_cast<si64>(buffer.size()) < size && !endOfFileReached)
{
si64 initialSize = buffer.size();
si64 currentStep = std::min<si64>(size, buffer.size());
@@ -127,7 +127,7 @@ si64 CCompressedStream::readMore(ui8 *data, si64 size)
int decompressed = inflateState->total_out;
inflateState->avail_out = (uInt)size;
inflateState->avail_out = static_cast<uInt>(size);
inflateState->next_out = data;
do
@@ -140,7 +140,7 @@ si64 CCompressedStream::readMore(ui8 *data, si64 size)
if (availSize != compressedBuffer.size())
gzipStream.reset();
inflateState->avail_in = (uInt)availSize;
inflateState->avail_in = static_cast<uInt>(availSize);
inflateState->next_in = compressedBuffer.data();
}
@@ -162,7 +162,7 @@ si64 CCompressedStream::readMore(ui8 *data, si64 size)
break;
default:
if (inflateState->msg == nullptr)
throw std::runtime_error("Decompression error. Return code was " + boost::lexical_cast<std::string>(ret));
throw std::runtime_error("Decompression error. Return code was " + std::to_string(ret));
else
throw std::runtime_error(std::string("Decompression error: ") + inflateState->msg);
}