From 19cb9cdfc26d8e209ca88cc10afe0cff554c499b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 04:39:06 +0200 Subject: Merging upstream version 1.15~pre1. Signed-off-by: Daniel Baumann --- encoder_base.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'encoder_base.c') diff --git a/encoder_base.c b/encoder_base.c index 047f372..d2ed53c 100644 --- a/encoder_base.c +++ b/encoder_base.c @@ -126,9 +126,8 @@ static void Mb_reset( struct Matchfinder_base * const mb ) /* End Of Stream marker => (dis == 0xFFFFFFFFU, len == min_match_len) */ static void LZeb_try_full_flush( struct LZ_encoder_base * const eb ) { - if( eb->member_finished || - Cb_free_bytes( &eb->renc.cb ) < max_marker_size + eb->renc.ff_count + Lt_size ) - return; + if( eb->member_finished || Cb_free_bytes( &eb->renc.cb ) < + max_marker_size + eb->renc.ff_count + Lt_size ) return; eb->member_finished = true; const int pos_state = Mb_data_position( &eb->mb ) & pos_state_mask; const State state = eb->state; @@ -171,9 +170,8 @@ static void LZeb_reset( struct LZ_encoder_base * const eb, const unsigned long long max_member_size = 0x0008000000000000ULL; /* 2 PiB */ int i; Mb_reset( &eb->mb ); - eb->member_size_limit = - min( max( min_member_size, member_size ), max_member_size ) - - Lt_size - max_marker_size; + eb->member_size_limit = min( max( min_member_size, member_size ), + max_member_size ) - Lt_size - max_marker_size; eb->crc = 0xFFFFFFFFU; Bm_array_init( eb->bm_literal[0], (1 << literal_context_bits) * 0x300 ); Bm_array_init( eb->bm_match[0], states * pos_states ); -- cgit v1.2.3