diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:20:42 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:20:42 -0700 |
| commit | a383133c4e7b93113cee912f213cf9502d785fa7 (patch) | |
| tree | bb7c39ab38418fcab817accad1e625b3de0c8237 /inftrees.c | |
| parent | 14763ac7c6c03bca62c39e35c03cf5bfc7728802 (diff) | |
| download | zlib-1.1.4.tar.gz zlib-1.1.4.tar.bz2 zlib-1.1.4.zip | |
zlib 1.1.4v1.1.4
Diffstat (limited to 'inftrees.c')
| -rw-r--r-- | inftrees.c | 9 |
1 files changed, 4 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* inftrees.c -- generate Huffman trees for efficient decoding | 1 | /* inftrees.c -- generate Huffman trees for efficient decoding |
| 2 | * Copyright (C) 1995-1998 Mark Adler | 2 | * Copyright (C) 1995-2002 Mark Adler |
| 3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| @@ -11,7 +11,7 @@ | |||
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
| 13 | const char inflate_copyright[] = | 13 | const char inflate_copyright[] = |
| 14 | " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; | 14 | " inflate 1.1.4 Copyright 1995-2002 Mark Adler "; |
| 15 | /* | 15 | /* |
| 16 | If you use the zlib library in a product, an acknowledgment is welcome | 16 | If you use the zlib library in a product, an acknowledgment is welcome |
| 17 | in the documentation of your product. If for some reason you cannot | 17 | in the documentation of your product. If for some reason you cannot |
| @@ -104,8 +104,7 @@ uIntf *v; /* working area: values in order of bit length */ | |||
| 104 | /* Given a list of code lengths and a maximum table size, make a set of | 104 | /* Given a list of code lengths and a maximum table size, make a set of |
| 105 | tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR | 105 | tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR |
| 106 | if the given code set is incomplete (the tables are still built in this | 106 | if the given code set is incomplete (the tables are still built in this |
| 107 | case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of | 107 | case), or Z_DATA_ERROR if the input is invalid. */ |
| 108 | lengths), or Z_MEM_ERROR if not enough memory. */ | ||
| 109 | { | 108 | { |
| 110 | 109 | ||
| 111 | uInt a; /* counter for codes of length k */ | 110 | uInt a; /* counter for codes of length k */ |
| @@ -231,7 +230,7 @@ uIntf *v; /* working area: values in order of bit length */ | |||
| 231 | 230 | ||
| 232 | /* allocate new table */ | 231 | /* allocate new table */ |
| 233 | if (*hn + z > MANY) /* (note: doesn't matter for fixed) */ | 232 | if (*hn + z > MANY) /* (note: doesn't matter for fixed) */ |
| 234 | return Z_MEM_ERROR; /* not enough memory */ | 233 | return Z_DATA_ERROR; /* overflow of MANY */ |
| 235 | u[h] = q = hp + *hn; | 234 | u[h] = q = hp + *hn; |
| 236 | *hn += z; | 235 | *hn += z; |
| 237 | 236 | ||
