diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:23:38 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:23:38 -0700 |
| commit | f0e76a6634eb26e3ddc6dfc6f2489553eff8c8f4 (patch) | |
| tree | 8bf5aaebe407006d34a13ae68659e85e1b55504f /contrib | |
| parent | 7a33a861d1526894272a8a4b08527ce32316d750 (diff) | |
| download | zlib-f0e76a6634eb26e3ddc6dfc6f2489553eff8c8f4.tar.gz | |
zlib 1.2.1.1v1.2.1.1
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/infback9/inftree9.c | 4 | ||||
| -rw-r--r-- | contrib/puff/puff.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index fe76a1b..337a277 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate9_copyright[] = - " inflate9 1.2.1 Copyright 1995-2003 Mark Adler "; + " inflate9 1.2.1.1 Copyright 1995-2003 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 @@ -64,7 +64,7 @@ unsigned short FAR *work; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, - 133, 133, 133, 133, 144, 76, 66}; + 133, 133, 133, 133, 144, 202, 196}; static const unsigned short dbase[32] = { /* Distance codes 0..31 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, diff --git a/contrib/puff/puff.c b/contrib/puff/puff.c index 7a8116b..ce0cc40 100644 --- a/contrib/puff/puff.c +++ b/contrib/puff/puff.c @@ -1,8 +1,8 @@ /* * puff.c - * Copyright (C) 2002, 2003 Mark Adler + * Copyright (C) 2002-2004 Mark Adler * For conditions of distribution and use, see copyright notice in puff.h - * version 1.7, 3 Mar 2003 + * version 1.8, 9 Jan 2004 * * puff.c is a simple inflate written to be an unambiguous way to specify the * deflate format. It is not written for speed but rather simplicity. As a @@ -60,6 +60,7 @@ * 1.6 7 Aug 2002 - Minor format changes * 1.7 3 Mar 2003 - Added test code for distribution * - Added zlib-like license + * 1.8 9 Jan 2004 - Added some comments on no distance codes case */ #include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */ @@ -577,6 +578,9 @@ local int fixed(struct state *s) * block is fewer bits), but it is allowed by the format. So incomplete * literal/length codes of one symbol should also be permitted. * + * - If there are only literal codes and no lengths, then there are no distance + * codes. This is represented by one distance code with zero bits. + * * - The list of up to 286 length/literal lengths and up to 30 distance lengths * are themselves compressed using Huffman codes and run-length encoding. In * the list of code lengths, a 0 symbol means no code, a 1..15 symbol means |