aboutsummaryrefslogtreecommitdiff
path: root/image/codecs/rpza.h
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2015-05-07 23:35:36 +0200
committerWillem Jan Palenstijn2015-05-07 23:35:36 +0200
commit57109ef0a8d30f15aa1fcef7d9d229fc9701f630 (patch)
tree230c0a7822875e9c41a4606fce54166d4dc37db0 /image/codecs/rpza.h
parentd9e93f8e015ce27a95090e854494c4b3f7d1c0d4 (diff)
parent04931d040085d77d031290fda57ca2c5dc486f54 (diff)
downloadscummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.tar.gz
scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.tar.bz2
scummvm-rg350-57109ef0a8d30f15aa1fcef7d9d229fc9701f630.zip
Merge branch 'master' into sherlock
Diffstat (limited to 'image/codecs/rpza.h')
-rw-r--r--image/codecs/rpza.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/image/codecs/rpza.h b/image/codecs/rpza.h
index d1dbbdb676..d62b385330 100644
--- a/image/codecs/rpza.h
+++ b/image/codecs/rpza.h
@@ -39,10 +39,22 @@ public:
~RPZADecoder();
const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream);
- Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); }
+ Graphics::PixelFormat getPixelFormat() const { return _format; }
+
+ bool containsPalette() const { return _ditherPalette != 0; }
+ const byte *getPalette() { _dirtyPalette = false; return _ditherPalette; }
+ bool hasDirtyPalette() const { return _dirtyPalette; }
+ bool canDither(DitherType type) const;
+ void setDither(DitherType type, const byte *palette);
private:
+ Graphics::PixelFormat _format;
Graphics::Surface *_surface;
+ byte *_ditherPalette;
+ bool _dirtyPalette;
+ byte *_colorMap;
+ uint16 _width, _height;
+ uint16 _blockWidth, _blockHeight;
};
} // End of namespace Image