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

@@ -23,16 +23,16 @@ public:
};
#define MyClassEncoderA(Name) class C ## Name: public CBranchConverter \
{ public: UInt32 SubFilter(Byte *data, UInt32 size); };
{ public: UInt32 SubFilter(Byte *data, UInt32 size); };
#define MyClassDecoderA(Name) class C ## Name: public CBranchConverter \
{ public: UInt32 SubFilter(Byte *data, UInt32 size); };
{ public: UInt32 SubFilter(Byte *data, UInt32 size); };
#define MyClassEncoderB(Name, ADD_ITEMS, ADD_INIT) class C ## Name: public CBranchConverter, public ADD_ITEMS \
{ public: UInt32 SubFilter(Byte *data, UInt32 size); ADD_INIT};
{ public: UInt32 SubFilter(Byte *data, UInt32 size); ADD_INIT};
#define MyClassDecoderB(Name, ADD_ITEMS, ADD_INIT) class C ## Name: public CBranchConverter, public ADD_ITEMS \
{ public: UInt32 SubFilter(Byte *data, UInt32 size); ADD_INIT};
{ public: UInt32 SubFilter(Byte *data, UInt32 size); ADD_INIT};
#define MyClassA(Name, id, subId) \
MyClassEncoderA(Name ## _Encoder) \

View File

@@ -3,8 +3,8 @@
#include "StdAfx.h"
#include "BranchMisc.h"
extern "C"
{
extern "C"
{
#include "../../../../C/Bra.h"
}

View File

@@ -1,3 +0,0 @@
// StdAfx.cpp
#include "StdAfx.h"

View File

@@ -4,8 +4,8 @@
#define __X86_H
#include "BranchCoder.h"
extern "C"
{
extern "C"
{
#include "../../../../C/Bra.h"
}
@@ -15,7 +15,7 @@ struct CBranch86
void x86Init() { x86_Convert_Init(_prevMask); }
};
MyClassB(BCJ_x86, 0x01, 3, CBranch86 ,
MyClassB(BCJ_x86, 0x01, 3, CBranch86 ,
virtual void SubInit() { x86Init(); })
#endif

View File

@@ -3,8 +3,8 @@
#include "StdAfx.h"
#include "x86_2.h"
extern "C"
{
extern "C"
{
#include "../../../../C/Alloc.h"
}
@@ -130,7 +130,7 @@ HRESULT CEncoder::CodeReal(ISequentialInStream **inStreams,
if (endPos < 5)
{
// change it
// change it
for (bufferPos = 0; bufferPos < endPos; bufferPos++)
{
Byte b = _buffer[bufferPos];
@@ -167,7 +167,7 @@ HRESULT CEncoder::CodeReal(ISequentialInStream **inStreams,
continue;
}
Byte nextByte = _buffer[bufferPos + 4];
UInt32 src =
UInt32 src =
(UInt32(nextByte) << 24) |
(UInt32(_buffer[bufferPos + 3]) << 16) |
(UInt32(_buffer[bufferPos + 2]) << 8) |
@@ -185,14 +185,14 @@ HRESULT CEncoder::CodeReal(ISequentialInStream **inStreams,
if (result == S_OK)
{
subStreamStartPos = subStreamEndPos;
subStreamEndPos += subStreamSize;
subStreamEndPos += subStreamSize;
subStreamIndex++;
}
else if (result == S_FALSE || result == E_NOTIMPL)
{
getSubStreamSize.Release();
subStreamStartPos = 0;
subStreamEndPos = subStreamStartPos - 1;
subStreamEndPos = subStreamStartPos - 1;
}
else
return result;
@@ -239,8 +239,8 @@ HRESULT CEncoder::CodeReal(ISequentialInStream **inStreams,
if (progress != NULL)
{
/*
const UInt64 compressedSize =
_mainStream.GetProcessedSize() +
const UInt64 compressedSize =
_mainStream.GetProcessedSize() +
_callStream.GetProcessedSize() +
_jumpStream.GetProcessedSize() +
_rangeEncoder.GetProcessedSize();
@@ -320,8 +320,8 @@ HRESULT CDecoder::CodeReal(ISequentialInStream **inStreams,
if (processedBytes >= (1 << 20) && progress != NULL)
{
/*
const UInt64 compressedSize =
_mainInStream.GetProcessedSize() +
const UInt64 compressedSize =
_mainInStream.GetProcessedSize() +
_callStream.GetProcessedSize() +
_jumpStream.GetProcessedSize() +
_rangeDecoder.GetProcessedSize();

View File

@@ -47,7 +47,7 @@ public:
~CCoderReleaser() { _coder->ReleaseStreams(); }
};
public:
public:
MY_UNKNOWN_IMP
@@ -65,14 +65,14 @@ public:
const UInt64 **outSizes,
UInt32 numOutStreams,
ICompressProgressInfo *progress);
};
};
#endif
class CDecoder:
public ICompressCoder2,
public CMyUnknownImp
{
{
public:
CInBuffer _mainInStream;
CInBuffer _callStream;
@@ -100,7 +100,7 @@ public:
~CCoderReleaser() { _coder->ReleaseStreams(); }
};
public:
public:
MY_UNKNOWN_IMP
HRESULT CodeReal(ISequentialInStream **inStreams,
const UInt64 **inSizes,
@@ -116,7 +116,7 @@ public:
const UInt64 **outSizes,
UInt32 numOutStreams,
ICompressProgressInfo *progress);
};
};
}}