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/smk_decoder.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/smk_decoder.cpp')
| -rw-r--r-- | video/smk_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp index b622a0ab61..356ec8e45b 100644 --- a/video/smk_decoder.cpp +++ b/video/smk_decoder.cpp @@ -580,7 +580,7 @@ void SmackerDecoder::SmackerVideoTrack::decodeFrame(Common::BitStream &bs) { while (run-- && block < blocks) { clr = _MClrTree->getCode(bs); map = _MMapTree->getCode(bs); - out = (byte *)_surface->pixels + (block / bw) * (stride * 4 * doubleY) + (block % bw) * 4; + out = (byte *)_surface->getBasePtr(0, 0) + (block / bw) * (stride * 4 * doubleY) + (block % bw) * 4; hi = clr >> 8; lo = clr & 0xff; for (i = 0; i < 4; i++) { @@ -613,7 +613,7 @@ void SmackerDecoder::SmackerVideoTrack::decodeFrame(Common::BitStream &bs) { } while (run-- && block < blocks) { - out = (byte *)_surface->pixels + (block / bw) * (stride * 4 * doubleY) + (block % bw) * 4; + out = (byte *)_surface->getBasePtr(0, 0) + (block / bw) * (stride * 4 * doubleY) + (block % bw) * 4; switch (mode) { case 0: for (i = 0; i < 4; ++i) { @@ -679,7 +679,7 @@ void SmackerDecoder::SmackerVideoTrack::decodeFrame(Common::BitStream &bs) { uint32 col; mode = type >> 8; while (run-- && block < blocks) { - out = (byte *)_surface->pixels + (block / bw) * (stride * 4 * doubleY) + (block % bw) * 4; + out = (byte *)_surface->getBasePtr(0, 0) + (block / bw) * (stride * 4 * doubleY) + (block % bw) * 4; col = mode * 0x01010101; for (i = 0; i < 4 * doubleY; ++i) { out[0] = out[1] = out[2] = out[3] = col; |