39 lines
1.2 KiB
Plaintext
39 lines
1.2 KiB
Plaintext
$NetBSD: patch-ad,v 1.1.1.1 2004/10/23 17:31:31 bencollver Exp $
|
|
|
|
--- libmpq/huffman.c.orig Fri Jan 16 15:45:19 2004
|
|
+++ libmpq/huffman.c
|
|
@@ -715,13 +715,13 @@ int libmpq_huff_do_decompress(struct huf
|
|
if (qd->bits > 7) {
|
|
is->bit_buf >>= 7;
|
|
is->bits -= 7;
|
|
- p_item1 = qd->p_item;
|
|
+ p_item1 = qd->val.p_item;
|
|
found = 1;
|
|
}
|
|
if (found == 0) {
|
|
is->bit_buf >>= qd->bits;
|
|
is->bits -= qd->bits;
|
|
- dcmp_byte = qd->dcmp_byte;
|
|
+ dcmp_byte = qd->val.dcmp_byte;
|
|
}
|
|
} else {
|
|
found = 1;
|
|
@@ -748,7 +748,7 @@ int libmpq_huff_do_decompress(struct huf
|
|
if (bit_count > 7) {
|
|
qd->offs00 = ht->offs0004;
|
|
qd->bits = bit_count;
|
|
- qd->p_item = p_item2;
|
|
+ qd->val.p_item = p_item2;
|
|
} else {
|
|
unsigned long index = n7bits & (0xFFFFFFFF >> (32 - bit_count));
|
|
unsigned long add = (1 << bit_count);
|
|
@@ -756,7 +756,7 @@ int libmpq_huff_do_decompress(struct huf
|
|
for (qd = &ht->qd3474[index]; index <= 0x7F; index += add, qd += add) {
|
|
qd->offs00 = ht->offs0004;
|
|
qd->bits = bit_count;
|
|
- qd->dcmp_byte = p_item1->dcmp_byte;
|
|
+ qd->val.dcmp_byte = p_item1->dcmp_byte;
|
|
}
|
|
}
|
|
}
|