Merging upstream version 1.7~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
d13efc182f
commit
0b33c152ed
16 changed files with 105 additions and 118 deletions
|
@ -209,7 +209,7 @@ int LZd_decode_member( struct LZ_decoder * const d,
|
|||
const int pos_state = LZd_data_position( d ) & pos_state_mask;
|
||||
if( Rd_decode_bit( rdec, &d->bm_match[state][pos_state] ) == 0 ) /* 1st bit */
|
||||
{
|
||||
const uint8_t prev_byte = LZd_get_prev_byte( d );
|
||||
const uint8_t prev_byte = LZd_peek_prev( d );
|
||||
if( St_is_char( state ) )
|
||||
{
|
||||
state -= ( state < 4 ) ? state : 3;
|
||||
|
@ -221,7 +221,7 @@ int LZd_decode_member( struct LZ_decoder * const d,
|
|||
state -= ( state < 10 ) ? 3 : 6;
|
||||
LZd_put_byte( d, Rd_decode_matched( rdec,
|
||||
d->bm_literal[get_lit_state(prev_byte)],
|
||||
LZd_get_byte( d, rep0 ) ) );
|
||||
LZd_peek( d, rep0 ) ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -249,7 +249,7 @@ int LZd_decode_member( struct LZ_decoder * const d,
|
|||
{
|
||||
if( Rd_decode_bit( rdec, &d->bm_len[state][pos_state] ) == 0 ) /* 4th bit */
|
||||
{ state = St_set_short_rep( state );
|
||||
LZd_put_byte( d, LZd_get_byte( d, rep0 ) ); continue; }
|
||||
LZd_put_byte( d, LZd_peek( d, rep0 ) ); continue; }
|
||||
}
|
||||
state = St_set_rep( state );
|
||||
len = min_match_len + Rd_decode_len( rdec, &d->rep_len_model, pos_state );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue