Merging upstream version 1.7~rc1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 3 insertions, 3 deletions

diff --git a/decoder.c b/decoder.c
index 07f5baf..9acae37 100644
--- a/decoder.c
+++ b/decoder.c
@@ -66,7 +66,7 @@ static int LZd_decode_member( struct LZ_decoder * const d )
       return 0;
     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;
@@ -78,7 +78,7 @@ static 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, d->rep0 ) ) );
+                      LZd_peek( d, d->rep0 ) ) );
         }
       }
     else
@@ -106,7 +106,7 @@ static 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, d->rep0 ) ); continue; }
+              LZd_put_byte( d, LZd_peek( d, d->rep0 ) ); continue; }
           }
         *state = St_set_rep( *state );
         len = min_match_len + Rd_decode_len( rdec, &d->rep_len_model, pos_state );