4.59 beta

This commit is contained in:
Igor Pavlov
2008-08-13 00:00:00 +00:00
committed by Kornel Lesiński
parent 3901bf0ab8
commit 173c07e166
781 changed files with 22124 additions and 13650 deletions

View File

@@ -40,7 +40,7 @@ const int kLevelSymbolSame = 19;
const int kLevelSymbolZerosStartValue = 4;
const int kLevelSymbolZerosNumBits = 4;
const int kLevelSymbolZerosBigStartValue = kLevelSymbolZerosStartValue +
const int kLevelSymbolZerosBigStartValue = kLevelSymbolZerosStartValue +
(1 << kLevelSymbolZerosNumBits);
const int kLevelSymbolZerosBigNumBits = 5;

View File

@@ -28,7 +28,7 @@ void Cx86ConvertOutStream::MakeTranslation()
Int32 pos = (Int32)(m_ProcessedSize + i - 1);
if (absValue >= -pos && absValue < (Int32)m_TranslationSize)
{
UInt32 offset = (absValue >= 0) ?
UInt32 offset = (absValue >= 0) ?
absValue - pos :
absValue + m_TranslationSize;
for(j = 0; j < 4; j++)

View File

@@ -11,7 +11,7 @@ namespace NLzx {
const int kUncompressedBlockSize = 1 << 15;
class Cx86ConvertOutStream:
class Cx86ConvertOutStream:
public ISequentialOutStream,
public CMyUnknownImp
{

View File

@@ -1,12 +1,12 @@
// LzxDecoder.cpp
// LzxDecoder.cpp
#include "StdAfx.h"
#include "LzxDecoder.h"
#include "Common/Defs.h"
extern "C"
{
extern "C"
{
#include "../../../../C/Alloc.h"
}
#include "Windows/Defs.h"
@@ -307,7 +307,7 @@ HRESULT CDecoder::CodeSpec(UInt32 curSize)
}
HRESULT CDecoder::CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream,
ISequentialOutStream *outStream,
const UInt64 *, const UInt64 *outSize,
ICompressProgressInfo *progress)
{
@@ -338,7 +338,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream,
UInt64 nowPos64 = m_OutWindowStream.GetProcessedSize() - start;
RINOK(progress->SetRatioInfo(&inSize, &nowPos64));
}
}
}
flusher.NeedFlush = false;
return Flush();
}
@@ -374,7 +374,7 @@ STDMETHODIMP CDecoder::SetOutStreamSize(const UInt64 *outSize)
}
HRESULT CDecoder::SetParams(int numDictBits)
{
{
if (numDictBits < kNumDictionaryBitsMin || numDictBits > kNumDictionaryBitsMax)
return E_INVALIDARG;
UInt32 numPosSlots;

View File

@@ -36,10 +36,10 @@ public:
void Init()
{
m_Stream.Init();
m_BitPos = kNumBigValueBits;
m_BitPos = kNumBigValueBits;
}
UInt64 GetProcessedSize() const
UInt64 GetProcessedSize() const
{ return m_Stream.GetProcessedSize() - (kNumBigValueBits - m_BitPos) / 8; }
int GetBitPosition() const { return m_BitPos & 0xF; }
@@ -57,7 +57,7 @@ public:
UInt32 GetValue(int numBits) const
{
return ((m_Value >> ((32 - kNumValueBits) - m_BitPos)) & kBitDecoderValueMask) >>
return ((m_Value >> ((32 - kNumValueBits) - m_BitPos)) & kBitDecoderValueMask) >>
(kNumValueBits - numBits);
}
@@ -96,7 +96,7 @@ public:
};
}
class CDecoder :
class CDecoder :
public ICompressCoder,
public CMyUnknownImp
{
@@ -135,8 +135,8 @@ class CDecoder :
HRESULT CodeSpec(UInt32 size);
HRESULT CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream,
HRESULT CodeReal(ISequentialInStream *inStream,
ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);
public:
@@ -148,8 +148,8 @@ public:
STDMETHOD(Flush)();
// ICompressCoder interface
STDMETHOD(Code)(ISequentialInStream *inStream,
ISequentialOutStream *outStream,
STDMETHOD(Code)(ISequentialInStream *inStream,
ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize,
ICompressProgressInfo *progress);