diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2015-01-03 03:00:00 +0300 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:16:53 +0300 |
commit | 0713a3ab803e57401f18432148b4139e5fe6e5dd (patch) | |
tree | b66fd26676cf817f2bc2a889b6123c00da96d6d0 /CPP/7zip/Compress | |
parent | 7e021179cd9f46b5bf2d48aac84783ff431dd5ac (diff) |
9.389.38
Diffstat (limited to 'CPP/7zip/Compress')
-rw-r--r-- | CPP/7zip/Compress/BitlDecoder.h | 4 | ||||
-rw-r--r-- | CPP/7zip/Compress/DllExportsCompress.cpp | 2 | ||||
-rw-r--r-- | CPP/7zip/Compress/LzOutWindow.cpp | 2 | ||||
-rw-r--r-- | CPP/7zip/Compress/LzhDecoder.h | 2 | ||||
-rw-r--r-- | CPP/7zip/Compress/Rar2Decoder.cpp | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/CPP/7zip/Compress/BitlDecoder.h b/CPP/7zip/Compress/BitlDecoder.h index 27be1716..41e22fe7 100644 --- a/CPP/7zip/Compress/BitlDecoder.h +++ b/CPP/7zip/Compress/BitlDecoder.h @@ -121,12 +121,12 @@ public: void AlignToByte() { MovePos((32 - this->_bitPos) & 7); } - Byte ReadDirectByte() { return _stream.ReadByte(); } + Byte ReadDirectByte() { return this->_stream.ReadByte(); } Byte ReadAlignedByte() { if (this->_bitPos == kNumBigValueBits) - return _stream.ReadByte(); + return this->_stream.ReadByte(); Byte b = (Byte)(_normalValue & 0xFF); MovePos(8); return b; diff --git a/CPP/7zip/Compress/DllExportsCompress.cpp b/CPP/7zip/Compress/DllExportsCompress.cpp index 8b37c899..be429277 100644 --- a/CPP/7zip/Compress/DllExportsCompress.cpp +++ b/CPP/7zip/Compress/DllExportsCompress.cpp @@ -11,7 +11,7 @@ static const unsigned kNumCodecsMax = 48; unsigned g_NumCodecs = 0; const CCodecInfo *g_Codecs[kNumCodecsMax]; -void RegisterCodec(const CCodecInfo *codecInfo) +void RegisterCodec(const CCodecInfo *codecInfo) throw() { if (g_NumCodecs < kNumCodecsMax) g_Codecs[g_NumCodecs++] = codecInfo; diff --git a/CPP/7zip/Compress/LzOutWindow.cpp b/CPP/7zip/Compress/LzOutWindow.cpp index df46295b..eb346407 100644 --- a/CPP/7zip/Compress/LzOutWindow.cpp +++ b/CPP/7zip/Compress/LzOutWindow.cpp @@ -4,7 +4,7 @@ #include "LzOutWindow.h" -void CLzOutWindow::Init(bool solid) +void CLzOutWindow::Init(bool solid) throw() { if (!solid) COutBuffer::Init(); diff --git a/CPP/7zip/Compress/LzhDecoder.h b/CPP/7zip/Compress/LzhDecoder.h index a805f9f9..a0a7b244 100644 --- a/CPP/7zip/Compress/LzhDecoder.h +++ b/CPP/7zip/Compress/LzhDecoder.h @@ -39,7 +39,7 @@ public: { if (Symbol >= 0) return (UInt32)Symbol; - return DecodeSymbol(bitStream); + return this->DecodeSymbol(bitStream); } }; diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp index 1773939c..c4312f9b 100644 --- a/CPP/7zip/Compress/Rar2Decoder.cpp +++ b/CPP/7zip/Compress/Rar2Decoder.cpp @@ -69,8 +69,6 @@ Byte CFilter::Decode(int &channelDelta, Byte deltaByte) } } -static const char *kNumberErrorMessage = "Number error"; - static const UInt32 kHistorySize = 1 << 20; static const int kNumStats = 11; |