diff options
| author | Johannes Schickel | 2013-08-03 02:39:04 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-08-03 04:02:50 +0200 |
| commit | 63a2e47bfe2a0be8bc717a4274e94f78a98a9000 (patch) | |
| tree | 0ae8cc5b1e9c9886bf9d5445826febc0a411d7c7 | |
| parent | acfdfd46d16f840842b1e632d3af216d0d2c156f (diff) | |
| download | scummvm-rg350-63a2e47bfe2a0be8bc717a4274e94f78a98a9000.tar.gz scummvm-rg350-63a2e47bfe2a0be8bc717a4274e94f78a98a9000.tar.bz2 scummvm-rg350-63a2e47bfe2a0be8bc717a4274e94f78a98a9000.zip | |
GOB: Take advantage of Surface::getPixels.
| -rw-r--r-- | engines/gob/surface.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/videoplayer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/gob/surface.cpp b/engines/gob/surface.cpp index 0090045b45..870b0f15b3 100644 --- a/engines/gob/surface.cpp +++ b/engines/gob/surface.cpp @@ -821,7 +821,7 @@ bool Surface::loadIFF(Common::SeekableReadStream &stream) { return false; resize(decoder.getSurface()->w, decoder.getSurface()->h); - memcpy(_vidMem, decoder.getSurface()->getBasePtr(0, 0), decoder.getSurface()->w * decoder.getSurface()->h); + memcpy(_vidMem, decoder.getSurface()->getPixels(), decoder.getSurface()->w * decoder.getSurface()->h); return true; } diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index 8d37c59a85..155989ccee 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -738,7 +738,7 @@ bool VideoPlayer::copyFrame(int slot, Surface &dest, // is only used read-only in this case (as far as I can tell). Not casting // the const qualifier away will lead to an additional allocation and copy // of the frame data which is undesirable. - Surface src(surface->w, surface->h, surface->format.bytesPerPixel, (byte *)const_cast<void *>(surface->getBasePtr(0, 0))); + Surface src(surface->w, surface->h, surface->format.bytesPerPixel, (byte *)const_cast<void *>(surface->getPixels())); dest.blit(src, left, top, left + width - 1, top + height - 1, x, y, transp); return true; |