diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 13:55:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 13:56:28 +0100 |
| commit | 0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch) | |
| tree | eee062f34219e5c5d3f3e61caa5d3c39a5185794 /zlib/trees.c | |
| parent | 3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff) | |
| parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
| download | vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2 vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated zlib to 1.2.8
Conflicts:
zlib/win32/zlib.def
Diffstat (limited to 'zlib/trees.c')
| -rw-r--r-- | zlib/trees.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/zlib/trees.c b/zlib/trees.c index 459282d34..5e19f2630 100644 --- a/zlib/trees.c +++ b/zlib/trees.c @@ -148,8 +148,8 @@ local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); local int build_bl_tree OF((deflate_state *s)); local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, int blcodes)); -local void compress_block OF((deflate_state *s, ct_data *ltree, - ct_data *dtree)); +local void compress_block OF((deflate_state *s, const ct_data *ltree, + const ct_data *dtree)); local int detect_data_type OF((deflate_state *s)); local unsigned bi_reverse OF((unsigned value, int length)); local void bi_windup OF((deflate_state *s)); @@ -974,7 +974,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { #endif send_bits(s, (STATIC_TREES<<1)+last, 3); - compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); + compress_block(s, (const ct_data *)static_ltree, + (const ct_data *)static_dtree); #ifdef DEBUG s->compressed_len += 3 + s->static_len; #endif @@ -982,7 +983,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) send_bits(s, (DYN_TREES<<1)+last, 3); send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, max_blindex+1); - compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); + compress_block(s, (const ct_data *)s->dyn_ltree, + (const ct_data *)s->dyn_dtree); #ifdef DEBUG s->compressed_len += 3 + s->opt_len; #endif @@ -1059,8 +1061,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) */ local void compress_block(s, ltree, dtree) deflate_state *s; - ct_data *ltree; /* literal tree */ - ct_data *dtree; /* distance tree */ + const ct_data *ltree; /* literal tree */ + const ct_data *dtree; /* distance tree */ { unsigned dist; /* distance of matched string */ int lc; /* match length or unmatched char (if dist == 0) */ |