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

MOHAWK: Prefer getBasePtr over direct Surface::pixels access.

Browse source
This commit is contained in:
Johannes Schickel 2013-08-02 23:58:11 +02:00
parent 8f73027d82
commit 6eb9c8da9e
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/mohawk/bitmap.cpp
View file

@ -580,7 +580,7 @@ void MohawkBitmap::drawRaw(Graphics::Surface *surface) {
_data->skip(_header.bytesPerRow - _header.width * 3);
} else {
_data->read((byte *)surface->pixels + y * _header.width, _header.width);
_data->read((byte *)surface->getBasePtr(0, y), _header.width);
_data->skip(_header.bytesPerRow - _header.width);
}
}
@ -599,7 +599,7 @@ void MohawkBitmap::drawRLE8(Graphics::Surface *surface, bool isLE) {
for (uint16 i = 0; i < _header.height; i++) {
uint16 rowByteCount = isLE ? _data->readUint16LE() : _data->readUint16BE();
int32 startPos = _data->pos();
byte *dst = (byte *)surface->pixels + i * _header.width;
byte *dst = (byte *)surface->getBasePtr(0, i);
int16 remaining = _header.width;
while (remaining > 0) {
@ -779,7 +779,7 @@ MohawkSurface *DOSBitmap::decodeImage(Common::SeekableReadStream *stream) {
}
Graphics::Surface *surface = createSurface(_header.width, _header.height);
memset(surface->pixels, 0, _header.width * _header.height);
memset(surface->getBasePtr(0, 0), 0, _header.width * _header.height);
// Expand the <8bpp data to one byte per pixel
switch (getBitsPerPixel()) {
@ -801,7 +801,7 @@ MohawkSurface *DOSBitmap::decodeImage(Common::SeekableReadStream *stream) {
void DOSBitmap::expandMonochromePlane(Graphics::Surface *surface, Common::SeekableReadStream *rawStream) {
assert(surface->format.bytesPerPixel == 1);
byte *dst = (byte *)surface->pixels;
byte *dst = (byte *)surface->getBasePtr(0, 0);
// Expand the 8 pixels in a byte into a full byte per pixel
@ -830,7 +830,7 @@ void DOSBitmap::expandEGAPlanes(Graphics::Surface *surface, Common::SeekableRead
// Note that the image is in EGA planar form and not just standard 4bpp
// This seems to contradict the PoP specs which seem to do something else
byte *dst = (byte *)surface->pixels;
byte *dst = (byte *)surface->getBasePtr(0, 0);
for (uint32 i = 0; i < surface->h; i++) {
uint x = 0;