thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: Add support for 4bpp BMPs

Browse source
This commit is contained in:
Eugene Sandulenko 2016-05-18 02:23:11 +02:00
parent b9158fcf50
commit c18945e991
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
image/codecs/bmp_raw.cpp
View file

@ -48,7 +48,24 @@ const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStrea
int srcPitch = _width * (_bitsPerPixel >> 3); int srcPitch = _width * (_bitsPerPixel >> 3);
const int extraDataLength = (srcPitch % 4) ? 4 - (srcPitch % 4) : 0; const int extraDataLength = (srcPitch % 4) ? 4 - (srcPitch % 4) : 0;
if (_bitsPerPixel == 8) { if (_bitsPerPixel == 4) {
for (int i = 0; i < _height; i++) {
byte *dst = (byte *)_surface->getBasePtr(0, _height - i - 1);
for (int j = 0; j < _width; j++) {
byte color = stream.readByte();
*dst++ = (color & 0xf0) >> 4;
j++;
if (j ==_width)
break;
*dst++ = color & 0x0f;
}
stream.skip(extraDataLength);
}
} else if (_bitsPerPixel == 8) {
byte *dst = (byte *)_surface->getPixels(); byte *dst = (byte *)_surface->getPixels();
for (int i = 0; i < _height; i++) { for (int i = 0; i < _height; i++) {
@ -100,6 +117,7 @@ const Graphics::Surface *BitmapRawDecoder::decodeFrame(Common::SeekableReadStrea
Graphics::PixelFormat BitmapRawDecoder::getPixelFormat() const { Graphics::PixelFormat BitmapRawDecoder::getPixelFormat() const {
switch (_bitsPerPixel) { switch (_bitsPerPixel) {
case 4:
case 8: case 8:
return Graphics::PixelFormat::createFormatCLUT8(); return Graphics::PixelFormat::createFormatCLUT8();
case 24: case 24: