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/codecs/cinepak.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/codecs/cinepak.cpp')
| -rw-r--r-- | video/codecs/cinepak.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp index bcf0cf1180..a7782f4192 100644 --- a/video/codecs/cinepak.cpp +++ b/video/codecs/cinepak.cpp @@ -41,11 +41,11 @@ namespace Video { byte b = _clipTable[lum + (u << 1)]; \ \ if (_pixelFormat.bytesPerPixel == 2) \ - *((uint16 *)_curFrame.surface->pixels + offset) = _pixelFormat.RGBToColor(r, g, b); \ + *((uint16 *)_curFrame.surface->getPixels() + offset) = _pixelFormat.RGBToColor(r, g, b); \ else \ - *((uint32 *)_curFrame.surface->pixels + offset) = _pixelFormat.RGBToColor(r, g, b); \ + *((uint32 *)_curFrame.surface->getPixels() + offset) = _pixelFormat.RGBToColor(r, g, b); \ } else \ - *((byte *)_curFrame.surface->pixels + offset) = lum + *((byte *)_curFrame.surface->getPixels() + offset) = lum CinepakDecoder::CinepakDecoder(int bitsPerPixel) : Codec() { _curFrame.surface = NULL; |