potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

imgcodecs: fix regression 9376

Browse Source
This commit is contained in:
Alexander Alekhin
2017-08-29 13:31:26 +03:00
parent df1a026329
commit da9395b592
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/grfmt_bmp.cpp
+4 -2
View File
@@ -115,7 +115,7 @@ bool BmpDecoder::readHeader()
if( m_bpp <= 8 )
{
CV_Assert(clrused < 256);
CV_Assert(clrused <= 256);
memset(m_palette, 0, sizeof(m_palette));
m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );
iscolor = IsColorPalette( m_palette, m_bpp );
@@ -166,6 +166,7 @@ bool BmpDecoder::readHeader()
}
catch(...)
{
throw;
}
m_type = iscolor ? CV_8UC3 : CV_8UC1;
@@ -475,11 +476,12 @@ decode_rle8_bad: ;
result = true;
break;
default:
assert(0);
CV_Error(CV_StsError, "Invalid/unsupported mode");
}
}
catch(...)
{
throw;
}
return result;