diff options
| author | Matthew Hoops | 2010-12-16 01:41:11 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-12-16 01:41:11 +0000 |
| commit | 1ead0d8436cdea9fd6a54af6bf749297afa75a17 (patch) | |
| tree | 30803cfea2304588f235456fda98554fb3ec9807 /engines | |
| parent | 375f32fbe94e8500a03c19ed32865efdcde8ca8e (diff) | |
| download | scummvm-rg350-1ead0d8436cdea9fd6a54af6bf749297afa75a17.tar.gz scummvm-rg350-1ead0d8436cdea9fd6a54af6bf749297afa75a17.tar.bz2 scummvm-rg350-1ead0d8436cdea9fd6a54af6bf749297afa75a17.zip | |
VIDEO: Make VideoDecoder::getPalette() return a const byte pointer
svn-id: r54928
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mohawk/video.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/video/seq_decoder.h | 2 | ||||
| -rw-r--r-- | engines/sword1/animation.cpp | 2 | ||||
| -rw-r--r-- | engines/sword2/animation.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index e54aa67df3..11929c2852 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -187,7 +187,7 @@ bool VideoManager::updateBackgroundMovies() { if (frame->bytesPerPixel == 1 && pixelFormat.bytesPerPixel != 1) { convertedFrame = new Graphics::Surface(); - byte *palette = _videoStreams[i]->getPalette(); + const byte *palette = _videoStreams[i]->getPalette(); assert(palette); convertedFrame->create(frame->w, frame->h, pixelFormat.bytesPerPixel); diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h index 4d94d145ce..4150137223 100644 --- a/engines/sci/video/seq_decoder.h +++ b/engines/sci/video/seq_decoder.h @@ -49,7 +49,7 @@ public: uint32 getFrameCount() const { return _frameCount; } const Graphics::Surface *decodeNextFrame(); Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); } - byte *getPalette() { _dirtyPalette = false; return _palette; } + const byte *getPalette() { _dirtyPalette = false; return _palette; } bool hasDirtyPalette() const { return _dirtyPalette; } protected: diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 8df1812098..e0b601d547 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -264,7 +264,7 @@ bool MoviePlayer::playVideo() { uint32 weight; byte r, g, b; - byte *palette = _decoder->getPalette(); + const byte *palette = _decoder->getPalette(); for (int i = 0; i < 256; i++) { r = *palette++; diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 617c254ec4..50548486f0 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -291,7 +291,7 @@ bool MoviePlayer::playVideo() { uint32 weight; byte r, g, b; - byte *palette = _decoder->getPalette(); + const byte *palette = _decoder->getPalette(); for (int i = 0; i < 256; i++) { r = *palette++; |