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

Fix warnings in coding

Browse source
This commit is contained in:
Sergey Yershov 2016-12-19 18:57:30 +03:00
parent 6aaa267d72
commit 07cf333622
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coding/huffman.hpp
View file

@ -21,10 +21,10 @@ public:
struct Code
{
uint32_t bits;
uint32_t len;
size_t len;
Code() : bits(0), len(0) {}
Code(uint32_t bits, uint32_t len) : bits(bits), len(len) {}
Code(uint32_t bits, size_t len) : bits(bits), len(len) {}
bool operator<(const Code & o) const
{
@ -134,7 +134,7 @@ private:
Node *l, *r;
uint32_t symbol;
uint32_t freq;
uint32_t depth;
size_t depth;
bool isLeaf;
Node(uint32_t symbol, uint32_t freq, bool isLeaf)
@ -156,7 +156,7 @@ private:
// No need to clump the interface: keep private the methods
// that encode one symbol only.
template <typename TWriter>
uint32_t EncodeAndWrite(BitWriter<TWriter> & bitWriter, uint32_t symbol) const
size_t EncodeAndWrite(BitWriter<TWriter> & bitWriter, uint32_t symbol) const
{
Code code;
CHECK(Encode(symbol, code), ());

2
coding/zlib.cpp
View file

@ -25,7 +25,7 @@ ZLib::Processor::Processor(void const * data, size_t size) noexcept : m_init(fal
// zconf.h. So, for portability, const_cast<...> is used here, but
// in any case, zlib does not modify |data|.
m_stream.next_in = static_cast<unsigned char *>(const_cast<void *>(data));
m_stream.avail_in = size;
m_stream.avail_in = static_cast<unsigned int>(size);
m_stream.next_out = m_buffer;
m_stream.avail_out = kBufferSize;