Merging upstream version 1.6~pre3.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/encoder.h b/encoder.h
index 41daa48..fe44e71 100644
--- a/encoder.h
+++ b/encoder.h
@@ -143,6 +143,7 @@ class Matchfinder
 
   long long partial_data_pos;
   int dictionary_size_;		// bytes to keep in buffer before pos
+  const int after_size;		// bytes to keep in buffer after pos
   int buffer_size;
   uint8_t * buffer;
   int pos;
@@ -199,7 +200,6 @@ public:
 class Range_encoder
   {
   enum { buffer_size = 65536 };
-
   uint64_t low;
   long long partial_member_pos;
   uint8_t * const buffer;
@@ -569,7 +569,7 @@ class LZ_encoder
   int best_pair_sequence( const int reps[num_rep_distances],
                           const State & state );
 
-  void flush( const State & state );
+  void full_flush( const State & state );
 
 public:
   LZ_encoder( Matchfinder & mf, const File_header & header, const int odes );