diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2010-06-04 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:16:03 +0300 |
commit | 708873490ee36691d84cc06336aac87c5129f8a0 (patch) | |
tree | bbe6e5aa922a158e5810c1a2ff7c78927cc6d973 /CPP/7zip/Archive/Common | |
parent | 3dacb5eb8afda99aad81f4723cb966c0fa91ba1d (diff) |
9.149.14
Diffstat (limited to 'CPP/7zip/Archive/Common')
-rwxr-xr-x | CPP/7zip/Archive/Common/CoderMixer2.cpp | 2 | ||||
-rwxr-xr-x | CPP/7zip/Archive/Common/InStreamWithCRC.cpp | 2 | ||||
-rwxr-xr-x | CPP/7zip/Archive/Common/InStreamWithCRC.h | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/CPP/7zip/Archive/Common/CoderMixer2.cpp b/CPP/7zip/Archive/Common/CoderMixer2.cpp index aed94f9c..0b06a489 100755 --- a/CPP/7zip/Archive/Common/CoderMixer2.cpp +++ b/CPP/7zip/Archive/Common/CoderMixer2.cpp @@ -87,7 +87,7 @@ CCoderInfo2::CCoderInfo2(UInt32 numInStreams, UInt32 numOutStreams): { InSizes.Reserve(NumInStreams); InSizePointers.Reserve(NumInStreams); - OutSizePointers.Reserve(NumOutStreams); + OutSizes.Reserve(NumOutStreams); OutSizePointers.Reserve(NumOutStreams); } diff --git a/CPP/7zip/Archive/Common/InStreamWithCRC.cpp b/CPP/7zip/Archive/Common/InStreamWithCRC.cpp index 1d9e5556..569a56f3 100755 --- a/CPP/7zip/Archive/Common/InStreamWithCRC.cpp +++ b/CPP/7zip/Archive/Common/InStreamWithCRC.cpp @@ -21,8 +21,10 @@ STDMETHODIMP CInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *processedSi { UInt32 realProcessedSize; HRESULT result = _stream->Read(data, size, &realProcessedSize); + /* if (size > 0 && realProcessedSize == 0) _wasFinished = true; + */ _size += realProcessedSize; _crc = CrcUpdate(_crc, data, realProcessedSize); if(processedSize != NULL) diff --git a/CPP/7zip/Archive/Common/InStreamWithCRC.h b/CPP/7zip/Archive/Common/InStreamWithCRC.h index 0492a5f8..31b761e4 100755 --- a/CPP/7zip/Archive/Common/InStreamWithCRC.h +++ b/CPP/7zip/Archive/Common/InStreamWithCRC.h @@ -49,19 +49,19 @@ private: CMyComPtr<IInStream> _stream; UInt64 _size; UInt32 _crc; - bool _wasFinished; + // bool _wasFinished; public: void SetStream(IInStream *stream) { _stream = stream; } void Init() { _size = 0; - _wasFinished = false; + // _wasFinished = false; _crc = CRC_INIT_VAL; } void ReleaseStream() { _stream.Release(); } UInt32 GetCRC() const { return CRC_GET_DIGEST(_crc); } UInt64 GetSize() const { return _size; } - bool WasFinished() const { return _wasFinished; } + // bool WasFinished() const { return _wasFinished; } }; #endif |