X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flzx_compress.c;h=ca9906e7daef7c057994792ba567278a19a0fc95;hb=ce50e9190bdb770640a53a1a8d612229be65d8e7;hp=47d8bf0be9714e7fe1a9a1f846d6f1cf9f92cff7;hpb=4b076a156796c1c0358c2e7e3c6610a2e772dd49;p=wimlib

diff --git a/src/lzx_compress.c b/src/lzx_compress.c
index 47d8bf0b..ca9906e7 100644
--- a/src/lzx_compress.c
+++ b/src/lzx_compress.c
@@ -1709,15 +1709,21 @@ lzx_update_costs(struct lzx_compressor *c)
 	unsigned i;
 	const struct lzx_lens *lens = &c->codes[c->codes_index].lens;
 
-	for (i = 0; i < c->num_main_syms; i++)
-		c->costs.main[i] = (lens->main[i] ? lens->main[i] : 15) * LZX_BIT_COST;
+	for (i = 0; i < c->num_main_syms; i++) {
+		c->costs.main[i] = (lens->main[i] ? lens->main[i] :
+				    MAIN_CODEWORD_LIMIT) * LZX_BIT_COST;
+	}
 
-	for (i = 0; i < LZX_LENCODE_NUM_SYMBOLS; i++)
-		c->costs.len[i] = (lens->len[i] ? lens->len[i] : 15) * LZX_BIT_COST;
+	for (i = 0; i < LZX_LENCODE_NUM_SYMBOLS; i++) {
+		c->costs.len[i] = (lens->len[i] ? lens->len[i] :
+				   LENGTH_CODEWORD_LIMIT) * LZX_BIT_COST;
+	}
 
 #if LZX_CONSIDER_ALIGNED_COSTS
-	for (i = 0; i < LZX_ALIGNEDCODE_NUM_SYMBOLS; i++)
-		c->costs.aligned[i] = (lens->aligned[i] ? lens->aligned[i] : 7) * LZX_BIT_COST;
+	for (i = 0; i < LZX_ALIGNEDCODE_NUM_SYMBOLS; i++) {
+		c->costs.aligned[i] = (lens->aligned[i] ? lens->aligned[i] :
+				       ALIGNED_CODEWORD_LIMIT) * LZX_BIT_COST;
+	}
 #endif
 
 	lzx_compute_match_costs(c);
@@ -1803,7 +1809,7 @@ lzx_compress_near_optimal(struct lzx_compressor *c,
 			if (unlikely(max_len > in_end - in_next)) {
 				max_len = in_end - in_next;
 				nice_len = min(max_len, nice_len);
-				if (unlikely(max_len < 5)) {
+				if (unlikely(max_len < BT_MATCHFINDER_REQUIRED_NBYTES)) {
 					in_next++;
 					cache_ptr->length = 0;
 					cache_ptr++;
@@ -1843,7 +1849,7 @@ lzx_compress_near_optimal(struct lzx_compressor *c,
 					if (unlikely(max_len > in_end - in_next)) {
 						max_len = in_end - in_next;
 						nice_len = min(max_len, nice_len);
-						if (unlikely(max_len < 5)) {
+						if (unlikely(max_len < BT_MATCHFINDER_REQUIRED_NBYTES)) {
 							in_next++;
 							cache_ptr->length = 0;
 							cache_ptr++;