From f66493cb0e2e4baa840bdbf4894d02b54ef38d52 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 11:00:38 +0100 Subject: Merging upstream version 1.15. Signed-off-by: Daniel Baumann --- lzip.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lzip.h') diff --git a/lzip.h b/lzip.h index b563833..b4b51e2 100644 --- a/lzip.h +++ b/lzip.h @@ -48,6 +48,7 @@ enum { pos_states = 1 << pos_state_bits, pos_state_mask = pos_states - 1, + len_states = 4, dis_slot_bits = 6, start_dis_model = 4, end_dis_model = 14, @@ -65,12 +66,10 @@ enum { min_match_len = 2, // must be 2 max_match_len = min_match_len + max_len_symbols - 1, // 273 - min_match_len_limit = 5, + min_match_len_limit = 5 }; - max_dis_states = 4 }; - -inline int get_dis_state( const int len ) - { return std::min( len - min_match_len, max_dis_states - 1 ); } +inline int get_len_state( const int len ) + { return std::min( len - min_match_len, len_states - 1 ); } inline int get_lit_state( const uint8_t prev_byte ) { return ( prev_byte >> ( 8 - literal_context_bits ) ); } @@ -111,7 +110,7 @@ public: for( unsigned i = 0; i < filenames.size(); ++i ) { const std::string & s = filenames[i]; - const unsigned len = ( ( s == "-" ) ? stdin_name_len : s.size() ); + const unsigned len = ( s == "-" ) ? stdin_name_len : s.size(); if( len > longest_name ) longest_name = len; } if( longest_name == 0 ) longest_name = stdin_name_len; -- cgit v1.2.3