diff options
author | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
commit | bca8ce861ad3439881fef0f916b592aafc4ee010 (patch) | |
tree | caaa3d79b0b47624ef48a48248b63f765a5e0628 /video/codecs/qtrle.h | |
parent | c1b5626bca1e0e08316353f1ead00ed763cd5380 (diff) | |
parent | c839fd50b5ddfcceada8cbbd3046ce219df248a0 (diff) | |
download | scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.gz scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.bz2 scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.zip |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'video/codecs/qtrle.h')
-rw-r--r-- | video/codecs/qtrle.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/video/codecs/qtrle.h b/video/codecs/qtrle.h index 6f8e113ca5..d9db58ab23 100644 --- a/video/codecs/qtrle.h +++ b/video/codecs/qtrle.h @@ -34,13 +34,12 @@ public: ~QTRLEDecoder(); const Graphics::Surface *decodeImage(Common::SeekableReadStream *stream); - Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; } + Graphics::PixelFormat getPixelFormat() const; private: byte _bitsPerPixel; Graphics::Surface *_surface; - Graphics::PixelFormat _pixelFormat; void decode1(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange); void decode2_4(Common::SeekableReadStream *stream, uint32 rowPtr, uint32 linesToChange, byte bpp); |