diff options
| author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
| commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
| tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /graphics/decoders/pict.h | |
| parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
| parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
| download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'graphics/decoders/pict.h')
| -rw-r--r-- | graphics/decoders/pict.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/decoders/pict.h b/graphics/decoders/pict.h index 7497e3963f..6f0d86c7a1 100644 --- a/graphics/decoders/pict.h +++ b/graphics/decoders/pict.h @@ -88,9 +88,9 @@ private: bool _continueParsing; // Utility Functions - void unpackBitsRect(Common::SeekableReadStream &stream, bool hasPalette); + void unpackBitsRect(Common::SeekableReadStream &stream, bool withPalette); void unpackBitsLine(byte *out, uint32 length, Common::SeekableReadStream *stream, byte bitsPerPixel, byte bytesPerPixel); - void skipBitsRect(Common::SeekableReadStream &stream, bool hasPalette); + void skipBitsRect(Common::SeekableReadStream &stream, bool withPalette); void decodeCompressedQuickTime(Common::SeekableReadStream &stream); void outputPixelBuffer(byte *&out, byte value, byte bitsPerPixel); |