diff options
| author | Johannes Schickel | 2013-08-03 02:05:40 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-08-03 04:02:49 +0200 |
| commit | 6fce92b0ea2fce78c375ade0bc6c2ac4231b96bd (patch) | |
| tree | 6e35a62b296b6fd021c32e37136273cf1fda0b90 /video/codecs/qtrle.cpp | |
| parent | b7706acb4107b6dd6b562062f1d20720e0560f9e (diff) | |
| download | scummvm-rg350-6fce92b0ea2fce78c375ade0bc6c2ac4231b96bd.tar.gz scummvm-rg350-6fce92b0ea2fce78c375ade0bc6c2ac4231b96bd.tar.bz2 scummvm-rg350-6fce92b0ea2fce78c375ade0bc6c2ac4231b96bd.zip | |
VIDEO: Prefer getBasePtr over direct Surface::pixels access.
Diffstat (limited to 'video/codecs/qtrle.cpp')
| -rw-r--r-- | video/codecs/qtrle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp index d2cdea27de..0e356e5d63 100644 --- a/video/codecs/qtrle.cpp +++ b/video/codecs/qtrle.cpp @@ -61,7 +61,7 @@ QTRLEDecoder::QTRLEDecoder(uint16 width, uint16 height, byte bitsPerPixel) : Cod void QTRLEDecoder::decode1(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange) { uint32 pixelPtr = 0; - byte *rgb = (byte *)_surface->pixels; + byte *rgb = (byte *)_surface->getBasePtr(0, 0); while (linesToChange) { CHECK_STREAM_PTR(2); @@ -105,7 +105,7 @@ void QTRLEDecoder::decode1(Common::SeekableReadStream *stream, uint32 rowPtr, ui void QTRLEDecoder::decode2_4(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange, byte bpp) { uint32 pixelPtr = 0; - byte *rgb = (byte *)_surface->pixels; + byte *rgb = (byte *)_surface->getBasePtr(0, 0); byte numPixels = (bpp == 4) ? 8 : 16; while (linesToChange--) { @@ -165,7 +165,7 @@ void QTRLEDecoder::decode2_4(Common::SeekableReadStream *stream, uint32 rowPtr, void QTRLEDecoder::decode8(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange) { uint32 pixelPtr = 0; - byte *rgb = (byte *)_surface->pixels; + byte *rgb = (byte *)_surface->getBasePtr(0, 0); while (linesToChange--) { CHECK_STREAM_PTR(2); @@ -210,7 +210,7 @@ void QTRLEDecoder::decode8(Common::SeekableReadStream *stream, uint32 rowPtr, ui void QTRLEDecoder::decode16(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange) { uint32 pixelPtr = 0; - uint16 *rgb = (uint16 *)_surface->pixels; + uint16 *rgb = (uint16 *)_surface->getBasePtr(0, 0); while (linesToChange--) { CHECK_STREAM_PTR(2); @@ -248,7 +248,7 @@ void QTRLEDecoder::decode16(Common::SeekableReadStream *stream, uint32 rowPtr, u void QTRLEDecoder::decode24(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange) { uint32 pixelPtr = 0; - uint32 *rgb = (uint32 *)_surface->pixels; + uint32 *rgb = (uint32 *)_surface->getBasePtr(0, 0); while (linesToChange--) { CHECK_STREAM_PTR(2); @@ -294,7 +294,7 @@ void QTRLEDecoder::decode24(Common::SeekableReadStream *stream, uint32 rowPtr, u void QTRLEDecoder::decode32(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange) { uint32 pixelPtr = 0; - uint32 *rgb = (uint32 *)_surface->pixels; + uint32 *rgb = (uint32 *)_surface->getBasePtr(0, 0); while (linesToChange--) { CHECK_STREAM_PTR(2); |