Adding upstream version 1.18.upstream/1.18

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

1 files changed, 5 insertions, 2 deletions

diff --git a/encoder.cc b/encoder.cc
index 3b24c44..282a9b2 100644
--- a/encoder.cc
+++ b/encoder.cc
@@ -1,5 +1,5 @@
 /*  Lzip - LZMA lossless data compressor
-    Copyright (C) 2008-2015 Antonio Diaz Diaz.
+    Copyright (C) 2008-2016 Antonio Diaz Diaz.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,6 +30,9 @@
 #include "encoder.h"
 
 
+const CRC32 crc32;
+
+
 int LZ_encoder::get_match_pairs( Pair * pairs )
   {
   int len_limit = match_len_limit;
@@ -485,7 +488,7 @@ int LZ_encoder::sequence_optimizer( const int reps[num_rep_distances],
 bool LZ_encoder::encode_member( const unsigned long long member_size )
   {
   const unsigned long long member_size_limit =
-    member_size - File_trailer::size() - max_marker_size;
+    member_size - File_trailer::size - max_marker_size;
   const bool best = ( match_len_limit > 12 );
   const int dis_price_count = best ? 1 : 512;
   const int align_price_count = best ? 1 : dis_align_size;