diff options
author | Willem Jan Palenstijn | 2017-07-24 21:01:19 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2017-08-24 19:46:59 +0200 |
commit | dde259f06813534c7179a714403d8fd6fe918d09 (patch) | |
tree | 1379a5c2600057ba53032c722e3a5a1578db8507 /engines/groovie | |
parent | 265fc48d1590cdd503187c79dc254d65623c8d7b (diff) | |
download | scummvm-rg350-dde259f06813534c7179a714403d8fd6fe918d09.tar.gz scummvm-rg350-dde259f06813534c7179a714403d8fd6fe918d09.tar.bz2 scummvm-rg350-dde259f06813534c7179a714403d8fd6fe918d09.zip |
COMMON: Remove BitStream base class to allow inlining calls
All users of BitStream were in fact using a specific, hardcoded variant,
so we can hardcode that variant, removing the need for virtual calls,
and enabling inlining.
Diffstat (limited to 'engines/groovie')
-rw-r--r-- | engines/groovie/stuffit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/groovie/stuffit.cpp b/engines/groovie/stuffit.cpp index bbfcd3da82..4543e37a27 100644 --- a/engines/groovie/stuffit.cpp +++ b/engines/groovie/stuffit.cpp @@ -71,7 +71,7 @@ private: // Decompression Helpers void update14(uint16 first, uint16 last, byte *code, uint16 *freq) const; - void readTree14(Common::BitStream *bits, SIT14Data *dat, uint16 codesize, uint16 *result) const; + void readTree14(Common::BitStream8LSB *bits, SIT14Data *dat, uint16 codesize, uint16 *result) const; }; StuffItArchive::StuffItArchive() : Common::Archive() { @@ -302,7 +302,7 @@ struct SIT14Data { if (b->pos() & 7) \ b->skip(8 - (b->pos() & 7)) -void StuffItArchive::readTree14(Common::BitStream *bits, SIT14Data *dat, uint16 codesize, uint16 *result) const { +void StuffItArchive::readTree14(Common::BitStream8LSB *bits, SIT14Data *dat, uint16 codesize, uint16 *result) const { uint32 i, l, n; uint32 k = bits->getBit(); uint32 j = bits->getBits(2) + 2; @@ -429,7 +429,7 @@ Common::SeekableReadStream *StuffItArchive::decompress14(Common::SeekableReadStr byte *dst = (byte *)malloc(uncompressedSize); Common::MemoryWriteStream out(dst, uncompressedSize); - Common::BitStream *bits = new Common::BitStream8LSB(src); + Common::BitStream8LSB *bits = new Common::BitStream8LSB(src); uint32 i, j, k, l, m, n; |