pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[coding] Fixed ZLib wrappers.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-01-30 13:18:08 +03:00
parent c0a9fbc742
commit 39b800ec86
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coding/zlib.cpp
View file

@ -57,6 +57,14 @@ ZLib::DeflateProcessor::DeflateProcessor(void const * data, size_t size, ZLib::L
ZLib::DeflateProcessor::~DeflateProcessor() noexcept
{
unsigned bytes = 0;
int bits = 0;
int const ret = deflatePending(&m_stream, &bytes, &bits);
UNUSED_VALUE(ret);
ASSERT_EQUAL(ret, Z_OK, (""));
ASSERT_EQUAL(bytes, 0, ("Some bytes were not flushed:", bytes));
ASSERT_EQUAL(bits, 0, ("Some bits were not flushed:", bits));
if (m_init)
deflateEnd(&m_stream);
}

15
coding/zlib.hpp
View file

@ -118,12 +118,19 @@ private:
while (true)
{
int const flush = processor.ConsumedAll() ? Z_FINISH : Z_NO_FLUSH;
int const ret = processor.Process(flush);
if (ret != Z_OK && ret != Z_STREAM_END)
return false;
int ret = Z_OK;
while (true)
{
ret = processor.Process(flush);
if (ret != Z_OK && ret != Z_STREAM_END)
return false;
if (!processor.BufferIsFull())
break;
if (processor.BufferIsFull())
processor.MoveOut(out);
}
if (flush == Z_FINISH && ret == Z_STREAM_END)
break;