diff options
Diffstat (limited to 'fast_encoder.c')
| -rw-r--r-- | fast_encoder.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fast_encoder.c b/fast_encoder.c index bab87ca..e7a746a 100644 --- a/fast_encoder.c +++ b/fast_encoder.c @@ -1,5 +1,5 @@ /* Clzip - LZMA lossless data compressor - Copyright (C) 2010-2024 Antonio Diaz Diaz. + Copyright (C) 2010-2025 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ #include "fast_encoder.h" -int FLZe_longest_match_len( struct FLZ_encoder * const fe, int * const distance ) +int FLZe_longest_match_len( FLZ_encoder * const fe, int * const distance ) { enum { len_limit = 16 }; const int available = min( Mb_available_bytes( &fe->eb.mb ), max_match_len ); @@ -69,7 +69,7 @@ int FLZe_longest_match_len( struct FLZ_encoder * const fe, int * const distance } -bool FLZe_encode_member( struct FLZ_encoder * const fe, +bool FLZe_encode_member( FLZ_encoder * const fe, const unsigned long long member_size ) { const unsigned long long member_size_limit = @@ -153,22 +153,22 @@ bool FLZe_encode_member( struct FLZ_encoder * const fe, if( match_byte == cur_byte ) { - const int short_rep_price = price1( fe->eb.bm_match[state][pos_state] ) + - price1( fe->eb.bm_rep[state] ) + - price0( fe->eb.bm_rep0[state] ) + - price0( fe->eb.bm_len[state][pos_state] ); + const int shortrep_price = price1( fe->eb.bm_match[state][pos_state] ) + + price1( fe->eb.bm_rep[state] ) + + price0( fe->eb.bm_rep0[state] ) + + price0( fe->eb.bm_len[state][pos_state] ); int price = price0( fe->eb.bm_match[state][pos_state] ); if( St_is_char( state ) ) price += LZeb_price_literal( &fe->eb, prev_byte, cur_byte ); else price += LZeb_price_matched( &fe->eb, prev_byte, cur_byte, match_byte ); - if( short_rep_price < price ) + if( shortrep_price < price ) { Re_encode_bit( &fe->eb.renc, &fe->eb.bm_match[state][pos_state], 1 ); Re_encode_bit( &fe->eb.renc, &fe->eb.bm_rep[state], 1 ); Re_encode_bit( &fe->eb.renc, &fe->eb.bm_rep0[state], 0 ); Re_encode_bit( &fe->eb.renc, &fe->eb.bm_len[state][pos_state], 0 ); - state = St_set_short_rep( state ); + state = St_set_shortrep( state ); continue; } } |