From e014475fba041d91e3977fe64298c6a2cbe8195e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 1 Jan 2014 15:43:19 -0600 Subject: [PATCH] Replace num_fast_bytes => nice_match_length There is no binary tree match-finder anymore, so 'nice_match_length' makes more sense. --- include/wimlib.h | 9 +++++---- programs/imagex.c | 2 +- src/lzx-compress.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/wimlib.h b/include/wimlib.h index 0fc5fb9f..c0aaf13b 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -4014,10 +4014,11 @@ struct wimlib_lzx_compressor_params { uint32_t slow_reserved1 : 31; - /** Matches with length (in bytes) longer than this - * value are immediately taken without spending time on - * minimum-cost measurements. Suggested value: 32. */ - uint32_t num_fast_bytes; + /** Matches with length (in bytes) greater than or equal + * to this value are immediately taken without spending + * time on minimum-cost measurements. Suggested value: + * 32. */ + uint32_t nice_match_length; /** Number of passes to compute a match/literal sequence * for each LZX block. This is for an iterative diff --git a/programs/imagex.c b/programs/imagex.c index d64f2e04..0a0934d9 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -446,7 +446,7 @@ set_compress_slow(void) .alg_params = { .slow = { .use_len2_matches = 1, - .num_fast_bytes = 96, + .nice_match_length = 96, .num_optim_passes = 4, .max_search_depth = 100, .max_matches_per_pos = 10, diff --git a/src/lzx-compress.c b/src/lzx-compress.c index ae4bfa72..2cce4441 100644 --- a/src/lzx-compress.c +++ b/src/lzx-compress.c @@ -1675,7 +1675,7 @@ lzx_create_compressor(size_t window_size, .alg_params = { .slow = { .use_len2_matches = 1, - .num_fast_bytes = 32, + .nice_match_length = 32, .num_optim_passes = 2, .max_search_depth = 50, .max_matches_per_pos = 3, @@ -1741,7 +1741,7 @@ lzx_create_compressor(size_t window_size, if (params->algorithm == WIMLIB_LZX_ALGORITHM_SLOW) { if (!lz_match_chooser_init(&ctx->mc, LZX_OPTIM_ARRAY_SIZE, - params->alg_params.slow.num_fast_bytes, + params->alg_params.slow.nice_match_length, LZX_MAX_MATCH_LEN)) goto oom; } -- 2.43.0