WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 23:00:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix broken BMP decode

Browse Source
This commit is contained in:
elasota
2020-02-20 01:30:25 -05:00
parent 505941a9e4
commit fcd8fdb17e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PortabilityLayer/PLQDraw.cpp
View File

@@ -622,6 +622,9 @@ void DrawSurface::DrawPicture(THandle<BitmapImage> pictHdl, const Rect &bounds)
if (!bounds.IsValid() || bounds.Width() == 0 || bounds.Height() == 0) if (!bounds.IsValid() || bounds.Width() == 0 || bounds.Height() == 0)
return; return;
if (pictHdl.MMBlock()->m_size < sizeof(BitmapImage))
return;
BitmapImage *bmpPtr = *pictHdl; BitmapImage *bmpPtr = *pictHdl;
if (!bmpPtr) if (!bmpPtr)
return; return;
@@ -851,9 +854,9 @@ void DrawSurface::DrawPicture(THandle<BitmapImage> pictHdl, const Rect &bounds)
const uint8_t srcHigh = currentSourceRow[srcColIndex * 2 + 1]; const uint8_t srcHigh = currentSourceRow[srcColIndex * 2 + 1];
const unsigned int combinedValue = srcLow | (srcHigh << 8); const unsigned int combinedValue = srcLow | (srcHigh << 8);
const unsigned int b = (srcLow & 0x1f); const unsigned int b = (combinedValue & 0x1f);
const unsigned int g = ((srcLow >> 5) & 0x1f); const unsigned int g = ((combinedValue >> 5) & 0x1f);
const unsigned int r = ((srcLow >> 10) & 0x1f); const unsigned int r = ((combinedValue >> 10) & 0x1f);
const unsigned int xr = (r << 5) | (r >> 2); const unsigned int xr = (r << 5) | (r >> 2);
const unsigned int xg = (g << 5) | (g >> 2); const unsigned int xg = (g << 5) | (g >> 2);