| Index: third_party/zlib/deflate.h
|
| diff --git a/third_party/zlib/deflate.h b/third_party/zlib/deflate.h
|
| index d15f2b5d58d5bc8053161445b16e46a3a53d79f3..c61e4abc905f930247bd3ad6dc22a5996ddb56f2 100644
|
| --- a/third_party/zlib/deflate.h
|
| +++ b/third_party/zlib/deflate.h
|
| @@ -1,5 +1,5 @@
|
| /* deflate.h -- internal compression state
|
| - * Copyright (C) 1995-2010 Jean-loup Gailly
|
| + * Copyright (C) 1995-2012 Jean-loup Gailly
|
| * For conditions of distribution and use, see copyright notice in zlib.h
|
| */
|
|
|
| @@ -48,6 +48,9 @@
|
| #define MAX_BITS 15
|
| /* All codes must not exceed MAX_BITS bits */
|
|
|
| +#define Buf_size 16
|
| +/* size of bit buffer in bi_buf */
|
| +
|
| #define INIT_STATE 42
|
| #define EXTRA_STATE 69
|
| #define NAME_STATE 73
|
| @@ -104,11 +107,9 @@ typedef struct internal_state {
|
| int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
|
| gz_headerp gzhead; /* gzip header information to write */
|
| uInt gzindex; /* where in extra, name, or comment */
|
| - Byte method; /* STORED (for zip only) or DEFLATED */
|
| + Byte method; /* can only be DEFLATED */
|
| int last_flush; /* value of flush param for previous deflate call */
|
| -
|
| unsigned zalign(16) crc0[4 * 5];
|
| -
|
| /* used by deflate.c: */
|
|
|
| uInt w_size; /* LZ77 window size (32K by default) */
|
| @@ -195,7 +196,7 @@ typedef struct internal_state {
|
| int nice_match; /* Stop searching when current match exceeds this */
|
|
|
| /* used by trees.c: */
|
| - /* Didn't use ct_data typedef below to supress compiler warning */
|
| + /* Didn't use ct_data typedef below to suppress compiler warning */
|
| struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
|
| struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
|
| struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
|
| @@ -251,7 +252,7 @@ typedef struct internal_state {
|
| ulg opt_len; /* bit length of current block with optimal trees */
|
| ulg static_len; /* bit length of current block with static trees */
|
| uInt matches; /* number of string matches in current block */
|
| - int last_eob_len; /* bit length of EOB code for last block */
|
| + uInt insert; /* bytes at end of window left to insert */
|
|
|
| #ifdef DEBUG
|
| ulg compressed_len; /* total bit length of compressed file mod 2^32 */
|
| @@ -301,6 +302,7 @@ void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
|
| int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
|
| void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
|
| ulg stored_len, int last));
|
| +void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
|
| void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
|
| void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
|
| ulg stored_len, int last));
|
|
|