Kaydet (Commit) b107353a authored tarafından Caolán McNamara's avatar Caolán McNamara

wmf spec says that these are only allowed bitcount values

Change-Id: Ia174feec73ee676567a3632d2f88b11c176b6363
üst 95e1777b
...@@ -267,7 +267,19 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown ...@@ -267,7 +267,19 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown
rHeader.nSizeImage = 0; rHeader.nSizeImage = 0;
} }
return( ( rHeader.nPlanes == 1 ) && ( rIStm.GetError() == 0UL ) );
if (rHeader.nPlanes != 1)
return false;
if (rHeader.nBitCount != 0 && rHeader.nBitCount != 1 &&
rHeader.nBitCount != 4 && rHeader.nBitCount != 8 &&
rHeader.nBitCount != 16 && rHeader.nBitCount != 24 &&
rHeader.nBitCount != 32)
{
return false;
}
return rIStm.good();
} }
bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, bool bQuad ) bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, bool bQuad )
......
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