Commit da9395b5 authored by Alexander Alekhin's avatar Alexander Alekhin

imgcodecs: fix regression 9376

parent df1a0263
...@@ -115,7 +115,7 @@ bool BmpDecoder::readHeader() ...@@ -115,7 +115,7 @@ bool BmpDecoder::readHeader()
if( m_bpp <= 8 ) if( m_bpp <= 8 )
{ {
CV_Assert(clrused < 256); CV_Assert(clrused <= 256);
memset(m_palette, 0, sizeof(m_palette)); memset(m_palette, 0, sizeof(m_palette));
m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 ); m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );
iscolor = IsColorPalette( m_palette, m_bpp ); iscolor = IsColorPalette( m_palette, m_bpp );
...@@ -166,6 +166,7 @@ bool BmpDecoder::readHeader() ...@@ -166,6 +166,7 @@ bool BmpDecoder::readHeader()
} }
catch(...) catch(...)
{ {
throw;
} }
m_type = iscolor ? CV_8UC3 : CV_8UC1; m_type = iscolor ? CV_8UC3 : CV_8UC1;
...@@ -475,11 +476,12 @@ decode_rle8_bad: ; ...@@ -475,11 +476,12 @@ decode_rle8_bad: ;
result = true; result = true;
break; break;
default: default:
assert(0); CV_Error(CV_StsError, "Invalid/unsupported mode");
} }
} }
catch(...) catch(...)
{ {
throw;
} }
return result; return result;
......
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