summaryrefslogtreecommitdiffstats
path: root/lib/zlib/trees.c
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2015-07-12 14:46:33 +0200
committerJulian Laubstein <julianlaubstein@yahoo.de>2015-07-12 14:46:33 +0200
commit9b3b0470046bad345f6731d6327ed18ab8f933f2 (patch)
treee38c2864ebaff225774f2abb287ffa9ff71f2502 /lib/zlib/trees.c
parentMerge pull request #2328 from SamJBarney/master (diff)
parentAdded JsonCPP library location to search paths (diff)
downloadcuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.gz
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.bz2
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.lz
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.xz
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.zst
cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.zip
Diffstat (limited to '')
-rw-r--r--lib/zlib/trees.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/zlib/trees.c b/lib/zlib/trees.c
index 8c32b214b..1fd7759ef 100644
--- a/lib/zlib/trees.c
+++ b/lib/zlib/trees.c
@@ -146,8 +146,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));
@@ -972,7 +972,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
@@ -980,7 +981,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
@@ -1057,8 +1059,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) */