diff options
author | 2012-02-19 15:23:23 +0000 | |
---|---|---|
committer | 2012-02-19 15:23:23 +0000 | |
commit | cf4b58b6f630f0f7ef2d14be8f48de781de85170 (patch) | |
tree | fda19b40204c84e17d2c5965a7a1b7f15b6f85da /src/lib/lib7z/Ppmd7.c | |
parent | 2f8094ea333d06e32d2694a467a4b40e0aa835c1 (diff) |
Clean-ups and version bumpmame0145u1
Diffstat (limited to 'src/lib/lib7z/Ppmd7.c')
-rw-r--r-- | src/lib/lib7z/Ppmd7.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/lib7z/Ppmd7.c b/src/lib/lib7z/Ppmd7.c index bba4d06f0ab..58244e13610 100644 --- a/src/lib/lib7z/Ppmd7.c +++ b/src/lib/lib7z/Ppmd7.c @@ -148,7 +148,7 @@ static void GlueFreeBlocks(CPpmd7 *p) #else CPpmd7_Node_Ref head = p->AlignOffset + p->Size; #endif - + CPpmd7_Node_Ref n = head; unsigned i; @@ -175,7 +175,7 @@ static void GlueFreeBlocks(CPpmd7 *p) NODE(n)->Prev = head; if (p->LoUnit != p->HiUnit) ((CPpmd7_Node *)p->LoUnit)->Stamp = 1; - + /* Glue free blocks */ while (n != head) { @@ -193,7 +193,7 @@ static void GlueFreeBlocks(CPpmd7 *p) } n = node->Next; } - + /* Fill lists of free blocks */ for (n = NODE(head)->Next; n != head;) { @@ -319,7 +319,7 @@ static void RestartModel(CPpmd7 *p) for (m = 0; m < 64; m += 8) dest[m] = val; } - + for (i = 0; i < 25; i++) for (k = 0; k < 16; k++) { @@ -345,10 +345,10 @@ static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip) CPpmd_Byte_Ref upBranch = (CPpmd_Byte_Ref)SUCCESSOR(p->FoundState); CPpmd_State *ps[PPMD7_MAX_ORDER]; unsigned numPs = 0; - + if (!skip) ps[numPs++] = p->FoundState; - + while (c->Suffix) { CPpmd_Void_Ref successor; @@ -370,10 +370,10 @@ static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip) } ps[numPs++] = s; } - + upState.Symbol = *(const Byte *)Ppmd7_GetPtr(p, upBranch); SetSuccessor(&upState, upBranch + 1); - + if (c->NumStats == 1) upState.Freq = ONE_STATE(c)->Freq; else @@ -407,7 +407,7 @@ static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip) c = c1; } while (numPs != 0); - + return c; } @@ -423,11 +423,11 @@ static void UpdateModel(CPpmd7 *p) CPpmd_Void_Ref successor, fSuccessor = SUCCESSOR(p->FoundState); CTX_PTR c; unsigned s0, ns; - + if (p->FoundState->Freq < MAX_FREQ / 4 && p->MinContext->Suffix != 0) { c = SUFFIX(p->MinContext); - + if (c->NumStats == 1) { CPpmd_State *s = ONE_STATE(c); @@ -465,7 +465,7 @@ static void UpdateModel(CPpmd7 *p) SetSuccessor(p->FoundState, REF(p->MinContext)); return; } - + *p->Text++ = p->FoundState->Symbol; successor = REF(p->Text); if (p->Text >= p->UnitsStart) @@ -473,7 +473,7 @@ static void UpdateModel(CPpmd7 *p) RestartModel(p); return; } - + if (fSuccessor) { if (fSuccessor <= successor) @@ -497,9 +497,9 @@ static void UpdateModel(CPpmd7 *p) SetSuccessor(p->FoundState, successor); fSuccessor = REF(p->MinContext); } - + s0 = p->MinContext->SummFreq - (ns = p->MinContext->NumStats) - (p->FoundState->Freq - 1); - + for (c = p->MaxContext; c != p->MinContext; c = SUFFIX(c)) { unsigned ns1; @@ -566,7 +566,7 @@ static void UpdateModel(CPpmd7 *p) } p->MaxContext = p->MinContext = CTX(fSuccessor); } - + static void Rescale(CPpmd7 *p) { unsigned i, adder, sumFreq, escFreq; @@ -583,7 +583,7 @@ static void Rescale(CPpmd7 *p) adder = (p->OrderFall != 0); s->Freq = (Byte)((s->Freq + adder) >> 1); sumFreq = s->Freq; - + i = p->MinContext->NumStats - 1; do { @@ -601,7 +601,7 @@ static void Rescale(CPpmd7 *p) } } while (--i); - + if (s->Freq == 0) { unsigned numStats = p->MinContext->NumStats; |