diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:25:17 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:25:17 -0700 |
commit | abf180a067223611620dd97dd5681df7c7fa7c9b (patch) | |
tree | 48ce6022aa1670380c098bd0abed2ac4aa1d9ca0 /contrib/infback9 | |
parent | 9c3a5830218c4e7fff23b8fc4386269db77a03a9 (diff) | |
download | zlib-1.2.3.tar.gz zlib-1.2.3.tar.bz2 zlib-1.2.3.zip |
zlib 1.2.3v1.2.3
Diffstat (limited to 'contrib/infback9')
-rw-r--r-- | contrib/infback9/inftree9.c | 6 | ||||
-rw-r--r-- | contrib/infback9/inftree9.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index 9e37840..0993f75 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #define MAXBITS 15 | 9 | #define MAXBITS 15 |
10 | 10 | ||
11 | const char inflate9_copyright[] = | 11 | const char inflate9_copyright[] = |
12 | " inflate9 1.2.2.4 Copyright 1995-2005 Mark Adler "; | 12 | " inflate9 1.2.3 Copyright 1995-2005 Mark Adler "; |
13 | /* | 13 | /* |
14 | If you use the zlib library in a product, an acknowledgment is welcome | 14 | If you use the zlib library in a product, an acknowledgment is welcome |
15 | in the documentation of your product. If for some reason you cannot | 15 | in the documentation of your product. If for some reason you cannot |
@@ -64,7 +64,7 @@ unsigned short FAR *work; | |||
64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | 64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, | 65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, |
66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, | 66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, |
67 | 133, 133, 133, 133, 144, 206, 69}; | 67 | 133, 133, 133, 133, 144, 201, 196}; |
68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ | 68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ |
69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, | 69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, |
70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, | 70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, |
@@ -128,7 +128,7 @@ unsigned short FAR *work; | |||
128 | left -= count[len]; | 128 | left -= count[len]; |
129 | if (left < 0) return -1; /* over-subscribed */ | 129 | if (left < 0) return -1; /* over-subscribed */ |
130 | } | 130 | } |
131 | if (left > 0 && (type == CODES || (codes - count[0] != 1))) | 131 | if (left > 0 && (type == CODES || max != 1)) |
132 | return -1; /* incomplete set */ | 132 | return -1; /* incomplete set */ |
133 | 133 | ||
134 | /* generate offsets into symbol table for each length for sorting */ | 134 | /* generate offsets into symbol table for each length for sorting */ |
diff --git a/contrib/infback9/inftree9.h b/contrib/infback9/inftree9.h index 6a699a7..a268084 100644 --- a/contrib/infback9/inftree9.h +++ b/contrib/infback9/inftree9.h | |||
@@ -36,12 +36,12 @@ typedef struct { | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | /* Maximum size of dynamic tree. The maximum found in a long but non- | 38 | /* Maximum size of dynamic tree. The maximum found in a long but non- |
39 | exhaustive search was 1004 code structures (850 for length/literals | 39 | exhaustive search was 1444 code structures (852 for length/literals |
40 | and 154 for distances, the latter actually the result of an | 40 | and 592 for distances, the latter actually the result of an |
41 | exhaustive search). The true maximum is not known, but the value | 41 | exhaustive search). The true maximum is not known, but the value |
42 | below is more than safe. */ | 42 | below is more than safe. */ |
43 | #define ENOUGH 1440 | 43 | #define ENOUGH 2048 |
44 | #define MAXD 154 | 44 | #define MAXD 592 |
45 | 45 | ||
46 | /* Type of code to build for inftable() */ | 46 | /* Type of code to build for inftable() */ |
47 | typedef enum { | 47 | typedef enum { |