libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 21:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Add support for decoding bitmaps to 32bits surfaces

Browse Source
This commit is contained in:
Bastien Bouclet 2012-01-04 10:52:55 +01:00
parent ded7d86852
commit d677c4b3d2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/imagedec.cpp
View File

@ -117,18 +117,23 @@ Surface *BMPDecoder::decodeImage(Common::SeekableReadStream &stream, const Pixel
assert(newSurf);
newSurf->create(info.width, info.height, format);
assert(newSurf->pixels);
OverlayColor *curPixel = (OverlayColor*)newSurf->pixels + (newSurf->h-1) * newSurf->w;
byte *curPixel = (byte*)newSurf->pixels + (newSurf->h-1) * newSurf->pitch;
int pitchAdd = info.width % 4;
for (int i = 0; i < newSurf->h; ++i) {
for (int i2 = 0; i2 < newSurf->w; ++i2) {
b = stream.readByte();
g = stream.readByte();
r = stream.readByte();
*curPixel = format.RGBToColor(r, g, b);
++curPixel;
if (format.bytesPerPixel == 2)
*((uint16 *)curPixel) = format.RGBToColor(r, g, b);
else
*((uint32 *)curPixel) = format.RGBToColor(r, g, b);
curPixel += format.bytesPerPixel;
}
stream.seek(pitchAdd, SEEK_CUR);
curPixel -= newSurf->w*2;
curPixel -= newSurf->pitch * 2;
}
stream.seek(0);