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

[coding] Fixed PNG loading code.

Browse source
This commit is contained in:
Yuri Gorshenin 2015-03-10 19:36:00 +03:00 • committed by Alex Zolotarev
parent 9246fb1cca
commit 524bc91f37
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
coding/lodepng_io_private.hpp
View file

@ -174,11 +174,22 @@ protected:
void init()
{
unsigned char buf[30];
m_reader.Read(0, buf, 30);
// io_error_if(fread(buf, 1, 30, get()) != 30,
// "lodepng_check_validity: fail to read file");
m_decoder.inspect(buf, 30);
// 29 bytes are required to read: 8-bytes PNG magic, 4-bytes
// chunk length, 4-bytes chunk type, 4-bytes width, 4-bytes
// height, 1-byte bit depth, 1-byte color type, 1-byte
// compression type, 1-byte filter type and 1-byte interlace
// type.
//
// 4 more bytes are needed if CRC32 sum should be checked.
size_t const kMinSize = 29;
size_t const kMaxSize = kMinSize + 4;
unsigned char buf[kMaxSize];
size_t const size = m_decoder.settings.ignoreCrc ? kMinSize : kMaxSize;
m_reader.Read(0, buf, size);
// io_error_if(fread(buf, 1, 30, get()) != 30,
// "lodepng_check_validity: fail to read file");
m_decoder.inspect(buf, size);
}
public: