AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 20:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some mistakes in huffman table building. too tired.

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-30 00:53:49 +10:00
parent 2cc9bf7801
commit 6e39903c3b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Client/Deflate.c
View File

@ -168,12 +168,14 @@ void Huffman_Build(HuffmanTable* table, UInt8* bitLens, Int32 count) {
Int32 i; Int32 i;
table->FirstCodewords[0] = 0; table->FirstCodewords[0] = 0;
table->FirstOffsets[0] = 0; table->FirstOffsets[0] = 0;
table->EndCodewords[0] = -1;
Int32 bl_count[DEFLATE_MAX_BITS]; Int32 bl_count[DEFLATE_MAX_BITS];
Platform_MemSet(bl_count, 0, sizeof(bl_count)); Platform_MemSet(bl_count, 0, sizeof(bl_count));
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
bl_count[bitLens[i]]++; bl_count[bitLens[i]]++;
} }
bl_count[0] = 0;
for (i = 1; i < DEFLATE_MAX_BITS; i++) { for (i = 1; i < DEFLATE_MAX_BITS; i++) {
if (bl_count[i] > (1 << i)) { if (bl_count[i] > (1 << i)) {
ErrorHandler_Fail("Too many huffman codes for bit length"); ErrorHandler_Fail("Too many huffman codes for bit length");
@ -187,7 +189,7 @@ void Huffman_Build(HuffmanTable* table, UInt8* bitLens, Int32 count) {
next_code[i] = code; next_code[i] = code;
table->FirstCodewords[i] = (UInt16)code; table->FirstCodewords[i] = (UInt16)code;
table->FirstOffsets[i] = (UInt16)value; table->FirstOffsets[i] = (UInt16)value;
value += bl_count[i - 1]; value += bl_count[i];
if (bl_count[i] == 0) { if (bl_count[i] == 0) {
table->EndCodewords[i] = -1; table->EndCodewords[i] = -1;
@ -326,6 +328,9 @@ bool Deflate_Step(DeflateState* state) {
state->Index = 0; state->Index = 0;
state->State = DeflateState_DynamicLits; state->State = DeflateState_DynamicLits;
/* TODO: actually do something with this table */
HuffmanTable table;
Huffman_Build(&table, state->Buffer, DEFLATE_MAX_CODELENS);
} break; } break;
case DeflateState_DynamicLits: { case DeflateState_DynamicLits: {