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 /graphics/decoders/jpeg.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 'graphics/decoders/jpeg.cpp')
| -rw-r--r-- | graphics/decoders/jpeg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/decoders/jpeg.cpp b/graphics/decoders/jpeg.cpp index 75fdcd6e5a..ff018c799a 100644 --- a/graphics/decoders/jpeg.cpp +++ b/graphics/decoders/jpeg.cpp @@ -81,7 +81,7 @@ const Surface *JPEGDecoder::getSurface() const { const Graphics::Surface *uComponent = getComponent(2); const Graphics::Surface *vComponent = getComponent(3); - YUVToRGBMan.convert444(_rgbSurface, Graphics::YUVToRGBManager::kScaleFull, (byte *)yComponent->pixels, (byte *)uComponent->pixels, (byte *)vComponent->pixels, yComponent->w, yComponent->h, yComponent->pitch, uComponent->pitch); + YUVToRGBMan.convert444(_rgbSurface, Graphics::YUVToRGBManager::kScaleFull, (const byte *)yComponent->getPixels(), (const byte *)uComponent->getPixels(), (const byte *)vComponent->getPixels(), yComponent->w, yComponent->h, yComponent->pitch, uComponent->pitch); return _rgbSurface; } |