imgcodecs: fix regression 9376

alalek · alalek · commit da9395b59294 · 2017-09-19T13:05:34.000+03:00
diff --git a/modules/highgui/src/grfmt_bmp.cpp b/modules/highgui/src/grfmt_bmp.cpp
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ bool BmpDecoder::readHeader()`
`115`	`115`
`116`	`116`	`if( m_bpp <= 8 )`
`117`	`117`	`{`
`118`		`- CV_Assert(clrused < 256);`
	`118`	`+ CV_Assert(clrused <= 256);`
`119`	`119`	`memset(m_palette, 0, sizeof(m_palette));`
`120`	`120`	`m_strm.getBytes(m_palette, (clrused == 0? 1<<m_bpp : clrused)*4 );`
`121`	`121`	`iscolor = IsColorPalette( m_palette, m_bpp );`
`@@ -166,6 +166,7 @@ bool BmpDecoder::readHeader()`
`166`	`166`	`}`
`167`	`167`	`catch(...)`
`168`	`168`	`{`
	`169`	`+ throw;`
`169`	`170`	`}`
`170`	`171`
`171`	`172`	`m_type = iscolor ? CV_8UC3 : CV_8UC1;`
`@@ -475,11 +476,12 @@ decode_rle8_bad: ;`
`475`	`476`	`result = true;`
`476`	`477`	`break;`
`477`	`478`	`default:`
`478`		`- assert(0);`
	`479`	`+ CV_Error(CV_StsError, "Invalid/unsupported mode");`
`479`	`480`	`}`
`480`	`481`	`}`
`481`	`482`	`catch(...)`
`482`	`483`	`{`
	`484`	`+ throw;`
`483`	`485`	`}`
`484`	`486`
`485`	`487`	`return result;`