diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-13 15:17:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-13 15:17:36 (GMT) |
| commit | 2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb (patch) | |
| tree | d00bae4e3b897ce575c5abe4a286d1429a150aaf /compat/zlib/inftrees.c | |
| parent | 88e8f319eaabf10945c1b0533d35a14e53994997 (diff) | |
| parent | d1756f468478c8b9e0b652ada83fcef2bd8082c0 (diff) | |
| download | tcl-2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb.zip tcl-2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb.tar.gz tcl-2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb.tar.bz2 | |
merge trunk.
Add back Tcl_AddErrorInfo to stub table (it's still used by Tk 8.6)
Diffstat (limited to 'compat/zlib/inftrees.c')
| -rw-r--r-- | compat/zlib/inftrees.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/compat/zlib/inftrees.c b/compat/zlib/inftrees.c index abcd7c4..44d89cf 100644 --- a/compat/zlib/inftrees.c +++ b/compat/zlib/inftrees.c @@ -1,5 +1,5 @@ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2012 Mark Adler + * Copyright (C) 1995-2013 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.7 Copyright 1995-2012 Mark Adler "; + " inflate 1.2.8 Copyright 1995-2013 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, 78, 68}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; 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, @@ -208,8 +208,8 @@ unsigned short FAR *work; mask = used - 1; /* mask for comparing low */ /* check available table space */ - if ((type == LENS && used >= ENOUGH_LENS) || - (type == DISTS && used >= ENOUGH_DISTS)) + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) return 1; /* process all codes and make table entries */ @@ -277,8 +277,8 @@ unsigned short FAR *work; /* check for enough space */ used += 1U << curr; - if ((type == LENS && used >= ENOUGH_LENS) || - (type == DISTS && used >= ENOUGH_DISTS)) + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) return 1; /* point entry in root table to sub-table */ |