diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-06 12:52:43 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-06 12:52:43 +0000 |
commit | 73f5ce5a1a7ef15a0e889bf2416e401db59f8c28 (patch) | |
tree | 7bf509a1fbb746c7c77b3a7dce30d192729be136 /decoder.c | |
parent | Adding debian version 1.7~pre1-1. (diff) | |
download | clzip-73f5ce5a1a7ef15a0e889bf2416e401db59f8c28.tar.xz clzip-73f5ce5a1a7ef15a0e889bf2416e401db59f8c28.zip |
Merging upstream version 1.7~rc1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'decoder.c')
-rw-r--r-- | decoder.c | 6 |
1 files changed, 3 insertions, 3 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 ); |