mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4153 from stefan-cornelius:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-06-30 06:12:03 +00:00
commit 8869150649
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgcodecs/src/grfmt_sunras.cpp
View File

@ -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));