diff options
| author | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
| commit | ede418b67a0f14e4f17a2b03f5362741badd5532 (patch) | |
| tree | 07de039fac5c303f1b9fce372afe5fa19854f547 /common/unarj.cpp | |
| parent | 66d1f7a8de2ff5a21ad013f45924c406f4833e9a (diff) | |
| parent | 3e859768770a0b385e21c4528cd546b33ed9a55d (diff) | |
| download | scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.gz scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.bz2 scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.zip | |
VOYEUR: Merge of upstream
Diffstat (limited to 'common/unarj.cpp')
| -rw-r--r-- | common/unarj.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/common/unarj.cpp b/common/unarj.cpp index fe3c17a2ac..e8aed7cbd1 100644 --- a/common/unarj.cpp +++ b/common/unarj.cpp @@ -95,6 +95,12 @@ class ArjDecoder { public: ArjDecoder(const ArjHeader *hdr) { _compsize = hdr->compSize; + _compressed = 0; + _outstream = 0; + _bitbuf = 0; + _bytebuf = 0; + _bitcount = 0; + _blocksize = 0; } ~ArjDecoder() { @@ -112,7 +118,6 @@ public: uint16 _bitbuf; uint16 _bytebuf; int32 _compsize; - byte _subbitbuf; int _bitcount; void init_getbits(); @@ -132,9 +137,6 @@ public: private: byte _ntext[ARJ_FDICSIZ]; - int16 _getlen; - int16 _getbuf; - uint16 _left[2 * ARJ_NC - 1]; uint16 _right[2 * ARJ_NC - 1]; byte _c_len[ARJ_NC]; @@ -656,7 +658,6 @@ void ArjDecoder::decode_f(int32 origsize) { init_getbits(); ncount = 0; - _getlen = _getbuf = 0; r = 0; while (ncount < (uint32)origsize) { |