diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:20:15 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:20:15 -0700 |
commit | c34c1fcbb19852ca35216ad66276f4f86af3fc22 (patch) | |
tree | 4bd0972d6c682e474725eca372f6551d539f8768 /infblock.c | |
parent | 02b6cf579f02ec78c052735020a5d3c5723ed641 (diff) | |
download | zlib-675fbc51d8ff98b98dd6bd7c1fc093152e256959.tar.gz zlib-675fbc51d8ff98b98dd6bd7c1fc093152e256959.tar.bz2 zlib-675fbc51d8ff98b98dd6bd7c1fc093152e256959.zip |
zlib 1.1.2v1.1.2
Diffstat (limited to 'infblock.c')
-rw-r--r-- | infblock.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -11,6 +11,10 @@ | |||
11 | 11 | ||
12 | struct inflate_codes_state {int dummy;}; /* for buggy compilers */ | 12 | struct inflate_codes_state {int dummy;}; /* for buggy compilers */ |
13 | 13 | ||
14 | /* simplify the use of the inflate_huft type with some defines */ | ||
15 | #define exop word.what.Exop | ||
16 | #define bits word.what.Bits | ||
17 | |||
14 | /* Table for deflate from PKZIP's appnote.txt. */ | 18 | /* Table for deflate from PKZIP's appnote.txt. */ |
15 | local const uInt border[] = { /* Order of the bit length code lengths */ | 19 | local const uInt border[] = { /* Order of the bit length code lengths */ |
16 | 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; | 20 | 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; |
@@ -264,8 +268,8 @@ int r; | |||
264 | t = s->sub.trees.bb; | 268 | t = s->sub.trees.bb; |
265 | NEEDBITS(t) | 269 | NEEDBITS(t) |
266 | h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]); | 270 | h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]); |
267 | t = h->word.what.Bits; | 271 | t = h->bits; |
268 | c = h->more.Base; | 272 | c = h->base; |
269 | if (c < 16) | 273 | if (c < 16) |
270 | { | 274 | { |
271 | DUMPBITS(t) | 275 | DUMPBITS(t) |