blob: 7b92064eaefea53cfe99ddd7f088c714dd9a21cd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
diff -urN ../tmp-orig/cloop-2.01.4/advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h ./advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h
--- ../tmp-orig/cloop-2.01.4/advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h 2003-02-10 20:25:06.000000000 +0100
+++ ./advancecomp-1.9_create_compressed_fs/7z/AriBitCoder.h 2004-07-10 15:27:58.225214667 +0200
@@ -51,13 +51,13 @@
public:
void Encode(CRangeEncoder *aRangeEncoder, UINT32 aSymbol)
{
- aRangeEncoder->EncodeBit(m_Probability, kNumBitModelTotalBits, aSymbol);
- UpdateModel(aSymbol);
+ aRangeEncoder->EncodeBit(this->m_Probability, kNumBitModelTotalBits, aSymbol);
+ this->UpdateModel(aSymbol);
}
UINT32 GetPrice(UINT32 aSymbol) const
{
return g_PriceTables.m_StatePrices[
- (((m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
+ (((this->m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
}
};
@@ -68,11 +68,11 @@
public:
UINT32 Decode(CRangeDecoder *aRangeDecoder)
{
- UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * m_Probability;
+ UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * this->m_Probability;
if (aRangeDecoder->m_Code < aNewBound)
{
aRangeDecoder->m_Range = aNewBound;
- m_Probability += (kBitModelTotal - m_Probability) >> aNumMoveBits;
+ this->m_Probability += (kBitModelTotal - this->m_Probability) >> aNumMoveBits;
if (aRangeDecoder->m_Range < kTopValue)
{
aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();
@@ -84,7 +84,7 @@
{
aRangeDecoder->m_Range -= aNewBound;
aRangeDecoder->m_Code -= aNewBound;
- m_Probability -= (m_Probability) >> aNumMoveBits;
+ this->m_Probability -= (this->m_Probability) >> aNumMoveBits;
if (aRangeDecoder->m_Range < kTopValue)
{
aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();
|
GitWeb
