From 41463d1237df40b1cf3a1916057370c2913a5932 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 12:43:21 +0100
Subject: Merging upstream version 1.15.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 decoder.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'decoder.cc')

diff --git a/decoder.cc b/decoder.cc
index 379aa3d..21a225e 100644
--- a/decoder.cc
+++ b/decoder.cc
@@ -202,7 +202,7 @@ int LZ_decoder::decode_member( const Pretty_print & pp )
   Bit_model bm_rep1[State::states];
   Bit_model bm_rep2[State::states];
   Bit_model bm_len[State::states][pos_states];
-  Bit_model bm_dis_slot[max_dis_states][1<<dis_slot_bits];
+  Bit_model bm_dis_slot[dis_states][1<<dis_slot_bits];
   Bit_model bm_dis[modeled_distances-end_dis_model];
   Bit_model bm_align[dis_align_size];
   Len_model match_len_model;
@@ -237,12 +237,7 @@ int LZ_decoder::decode_member( const Pretty_print & pp )
       int len;
       if( rdec.decode_bit( bm_rep[state()] ) == 1 )		// 2nd bit
         {
-        if( rdec.decode_bit( bm_rep0[state()] ) == 0 )		// 3rd bit
-          {
-          if( rdec.decode_bit( bm_len[state()][pos_state] ) == 0 ) // 4th bit
-            { state.set_short_rep(); put_byte( get_byte( rep0 ) ); continue; }
-          }
-        else
+        if( rdec.decode_bit( bm_rep0[state()] ) == 1 )		// 3rd bit
           {
           unsigned distance;
           if( rdec.decode_bit( bm_rep1[state()] ) == 0 )	// 4th bit
@@ -258,8 +253,13 @@ int LZ_decoder::decode_member( const Pretty_print & pp )
           rep1 = rep0;
           rep0 = distance;
           }
-        len = min_match_len + rdec.decode_len( rep_len_model, pos_state );
+        else
+          {
+          if( rdec.decode_bit( bm_len[state()][pos_state] ) == 0 ) // 4th bit
+            { state.set_short_rep(); put_byte( get_byte( rep0 ) ); continue; }
+          }
         state.set_rep();
+        len = min_match_len + rdec.decode_len( rep_len_model, pos_state );
         }
       else
         {
-- 
cgit v1.2.3