diff options
| author | Borja Lorente | 2016-08-04 09:50:29 +0200 |
|---|---|---|
| committer | Borja Lorente | 2016-08-14 19:01:00 +0200 |
| commit | 427d69535f87c7a4ba4e82eedc3cae845f454535 (patch) | |
| tree | 0d05ce24931616729daa936a28c08f2ddd159c82 /engines/macventure/image.h | |
| parent | 06d9e188dfbe465c3adcc3e35d9547213c759d65 (diff) | |
| download | scummvm-rg350-427d69535f87c7a4ba4e82eedc3cae845f454535.tar.gz scummvm-rg350-427d69535f87c7a4ba4e82eedc3cae845f454535.tar.bz2 scummvm-rg350-427d69535f87c7a4ba4e82eedc3cae845f454535.zip | |
MACVENTURE: Fix object overflow
Diffstat (limited to 'engines/macventure/image.h')
| -rw-r--r-- | engines/macventure/image.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/macventure/image.h b/engines/macventure/image.h index e6b2515f5c..3520f8182e 100644 --- a/engines/macventure/image.h +++ b/engines/macventure/image.h @@ -77,10 +77,12 @@ private: void decodeHuffGraphic(const PPICHuff &huff, Common::BitStream &stream, Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); byte walkHuff(const PPICHuff &huff, Common::BitStream &stream); - void blitDirect(Graphics::ManagedSurface * target, uint32 ox, uint32 oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); - void blitBIC(Graphics::ManagedSurface * target, uint32 ox, uint32 oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); - void blitOR(Graphics::ManagedSurface * target, uint32 ox, uint32 oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); - void blitXOR(Graphics::ManagedSurface * target, uint32 ox, uint32 oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); + void blitDirect(Graphics::ManagedSurface * target, int ox, int oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); + void blitBIC(Graphics::ManagedSurface * target, int ox, int oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); + void blitOR(Graphics::ManagedSurface * target, int ox, int oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); + void blitXOR(Graphics::ManagedSurface * target, int ox, int oy, const Common::Array<byte> &data, uint bitHeight, uint bitWidth, uint rowBytes); + + void calculateSubsection(int &ox, int &oy, uint bitWidth, uint bitHeight, uint &sx, uint &sy, uint &w, uint &h); private: ObjID _id; |