diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 21:26:47 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 21:26:47 +0000 |
| commit | b4983fe4c3f633f88d7001690ff37218fb8a3245 (patch) | |
| tree | 91437cedd1ed1e109c653c9188015ac465d08690 /cpukit/zlib/inftrees.c | |
| parent | 2008-09-01 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-b4983fe4c3f633f88d7001690ff37218fb8a3245.tar.bz2 | |
Upgrade to zlib-1.2.3.
Diffstat (limited to 'cpukit/zlib/inftrees.c')
| -rw-r--r-- | cpukit/zlib/inftrees.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpukit/zlib/inftrees.c b/cpukit/zlib/inftrees.c index e5a934980f..8a9c13ff03 100644 --- a/cpukit/zlib/inftrees.c +++ b/cpukit/zlib/inftrees.c @@ -1,5 +1,5 @@ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2004 Mark Adler + * Copyright (C) 1995-2005 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.2.2 Copyright 1995-2004 Mark Adler "; + " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -62,7 +62,7 @@ unsigned short FAR *work; 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 199}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, @@ -232,6 +232,7 @@ unsigned short FAR *work; /* replicate for those indices with low len bits equal to huff */ incr = 1U << (len - drop); fill = 1U << curr; + min = fill; /* save offset to next table */ do { fill -= incr; next[(huff >> drop) + fill] = this; @@ -262,7 +263,7 @@ unsigned short FAR *work; drop = root; /* increment past last table */ - next += 1U << curr; + next += min; /* here min is 1 << curr */ /* determine length of next table */ curr = len - drop; |