From 0484693e1723bbab791c56f95597bd7dbe867d03 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 9 Sep 2011 23:24:33 -0700 Subject: zlib 1.2.2.2 --- trees.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'trees.c') diff --git a/trees.c b/trees.c index e5c66f6..48c651b 100644 --- a/trees.c +++ b/trees.c @@ -934,22 +934,6 @@ void _tr_flush_block(s, buf, stored_len, eof) if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN) set_data_type(s); -#ifdef DEBUG - /* Write out literal/length frequencies for benchmarking */ - if (z_verbose) { - FILE *freq; - freq = fopen("defreq.txt", "a"); - if (freq != NULL) { - int n; - fputs("ltree:", freq); - for (n = 0; n < L_CODES; n++) - fprintf(freq, " %d", s->dyn_ltree[n].Freq); - putc('\n', freq); - fclose(freq); - } - } -#endif - /* Construct the literal and distance trees */ build_tree(s, (tree_desc *)(&(s->l_desc))); Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, @@ -999,7 +983,7 @@ void _tr_flush_block(s, buf, stored_len, eof) #ifdef FORCE_STATIC } else if (static_lenb >= 0) { /* force static trees */ #else - } else if (static_lenb == opt_lenb) { + } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { #endif send_bits(s, (STATIC_TREES<<1)+eof, 3); compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); -- cgit v1.2.3-55-g6feb