Commit 88691506 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #4153 from stefan-cornelius:master

parents 50b453e5 e66a4a0e
...@@ -96,7 +96,7 @@ bool SunRasterDecoder::readHeader() ...@@ -96,7 +96,7 @@ bool SunRasterDecoder::readHeader()
(m_encoding == RAS_OLD || m_encoding == RAS_STANDARD || (m_encoding == RAS_OLD || m_encoding == RAS_STANDARD ||
(m_type == RAS_BYTE_ENCODED && m_bpp == 8) || m_type == RAS_FORMAT_RGB) && (m_type == RAS_BYTE_ENCODED && m_bpp == 8) || m_type == RAS_FORMAT_RGB) &&
((m_maptype == RMT_NONE && m_maplength == 0) || ((m_maptype == RMT_NONE && m_maplength == 0) ||
(m_maptype == RMT_EQUAL_RGB && m_maplength <= palSize && m_bpp <= 8))) (m_maptype == RMT_EQUAL_RGB && m_maplength <= palSize && m_maplength > 0 && m_bpp <= 8)))
{ {
memset( m_palette, 0, sizeof(m_palette)); memset( m_palette, 0, sizeof(m_palette));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment