diff options
| author | Johannes Schickel | 2013-08-07 12:24:59 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2013-08-07 12:24:59 -0700 |
| commit | 7f8308e0eb50c4e13ec0684619b5474983a93a66 (patch) | |
| tree | 0a057f01385a11d99add1e294f70891a8e8bf6c9 /video/dxa_decoder.cpp | |
| parent | 6e9390feb8166d5f9d6c6fdfe00a336b4f71de4c (diff) | |
| parent | e5f0c42a65f38611272542a144228753e0496493 (diff) | |
| download | scummvm-rg350-7f8308e0eb50c4e13ec0684619b5474983a93a66.tar.gz scummvm-rg350-7f8308e0eb50c4e13ec0684619b5474983a93a66.tar.bz2 scummvm-rg350-7f8308e0eb50c4e13ec0684619b5474983a93a66.zip | |
Merge pull request #365 from lordhoto/protected-pixels
Make Graphics::Surface::pixels protected.
Diffstat (limited to 'video/dxa_decoder.cpp')
| -rw-r--r-- | video/dxa_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp index 5ac9bd2088..27b1664b07 100644 --- a/video/dxa_decoder.cpp +++ b/video/dxa_decoder.cpp @@ -521,17 +521,17 @@ const Graphics::Surface *DXADecoder::DXAVideoTrack::decodeNextFrame() { memcpy(&_scaledBuffer[2 * cy * _width], &_frameBuffer1[cy * _width], _width); memset(&_scaledBuffer[((2 * cy) + 1) * _width], 0, _width); } - _surface->pixels = _scaledBuffer; + _surface->setPixels(_scaledBuffer); break; case S_DOUBLE: for (int cy = 0; cy < _curHeight; cy++) { memcpy(&_scaledBuffer[2 * cy * _width], &_frameBuffer1[cy * _width], _width); memcpy(&_scaledBuffer[((2 * cy) + 1) * _width], &_frameBuffer1[cy * _width], _width); } - _surface->pixels = _scaledBuffer; + _surface->setPixels(_scaledBuffer); break; case S_NONE: - _surface->pixels = _frameBuffer1; + _surface->setPixels(_frameBuffer1); break; } |