From 432394cea37e7b08ff3712ce6d42d05e39327a5c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 14:49:48 +0100 Subject: Merging upstream version 1.5. Signed-off-by: Daniel Baumann --- decoder.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'decoder.c') diff --git a/decoder.c b/decoder.c index 1b7e071..34850bc 100644 --- a/decoder.c +++ b/decoder.c @@ -88,13 +88,7 @@ static int LZd_decode_member( struct LZ_decoder * const decoder ) int len; if( Rd_decode_bit( rdec, &decoder->bm_rep[*state] ) == 1 ) /* 2nd bit */ { - if( Rd_decode_bit( rdec, &decoder->bm_rep0[*state] ) == 0 ) /* 3rd bit */ - { - if( Rd_decode_bit( rdec, &decoder->bm_len[*state][pos_state] ) == 0 ) /* 4th bit */ - { *state = St_set_short_rep( *state ); - LZd_put_byte( decoder, LZd_get_byte( decoder, decoder->rep0 ) ); continue; } - } - else + if( Rd_decode_bit( rdec, &decoder->bm_rep0[*state] ) == 1 ) /* 3rd bit */ { unsigned distance; if( Rd_decode_bit( rdec, &decoder->bm_rep1[*state] ) == 0 ) /* 4th bit */ @@ -110,6 +104,12 @@ static int LZd_decode_member( struct LZ_decoder * const decoder ) decoder->rep1 = decoder->rep0; decoder->rep0 = distance; } + else + { + if( Rd_decode_bit( rdec, &decoder->bm_len[*state][pos_state] ) == 0 ) /* 4th bit */ + { *state = St_set_short_rep( *state ); + LZd_put_byte( decoder, LZd_get_byte( decoder, decoder->rep0 ) ); continue; } + } *state = St_set_rep( *state ); len = min_match_len + Rd_decode_len( rdec, &decoder->rep_len_model, pos_state ); } -- cgit v1.2.3