diff options
| author | D G Turner | 2012-04-22 16:41:30 +0100 |
|---|---|---|
| committer | D G Turner | 2012-04-22 16:41:30 +0100 |
| commit | 4d6f2875de900ea41663b99be0f148096561bf5d (patch) | |
| tree | 1a5c1bed3159eebb1f1ad27a0b5be843b00d5269 /graphics | |
| parent | b7a5573dda40a120f3af7333caed7ad1d32b924c (diff) | |
| download | scummvm-rg350-4d6f2875de900ea41663b99be0f148096561bf5d.tar.gz scummvm-rg350-4d6f2875de900ea41663b99be0f148096561bf5d.tar.bz2 scummvm-rg350-4d6f2875de900ea41663b99be0f148096561bf5d.zip | |
GRAPHICS: Fix BMP getPalette function definition.
The BMP decoder getPalette function definition is now identical to
the other image format decoders subclassed from ImageDecoder.
This also fixes a overloaded virtual warning reported by salty-horse.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/decoders/bmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/decoders/bmp.h b/graphics/decoders/bmp.h index 6360aa81c9..8a37538ee1 100644 --- a/graphics/decoders/bmp.h +++ b/graphics/decoders/bmp.h @@ -51,7 +51,7 @@ public: void destroy(); virtual bool loadStream(Common::SeekableReadStream &stream); virtual const Surface *getSurface() const { return _surface; } - virtual const byte *getPalette() { return _palette; } + const byte *getPalette() const { return _palette; } private: Surface *_surface; |