summaryrefslogtreecommitdiffstats
path: root/encoder_base.cc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-21 12:12:07 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-21 12:12:28 +0000
commit60f1f649f81ccd08f7def8127593b4a17a2db52e (patch)
tree210fc05a564804b3b1c8e5c94492b091ccd5c9e0 /encoder_base.cc
parentReleasing debian version 1.22-5. (diff)
downloadlzip-60f1f649f81ccd08f7def8127593b4a17a2db52e.tar.xz
lzip-60f1f649f81ccd08f7def8127593b4a17a2db52e.zip
Merging upstream version 1.23.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'encoder_base.cc')
-rw-r--r--encoder_base.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/encoder_base.cc b/encoder_base.cc
index eb23532..a239d1f 100644
--- a/encoder_base.cc
+++ b/encoder_base.cc
@@ -1,5 +1,5 @@
/* Lzip - LZMA lossless data compressor
- Copyright (C) 2008-2021 Antonio Diaz Diaz.
+ Copyright (C) 2008-2022 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
@@ -104,8 +104,7 @@ Matchfinder_base::Matchfinder_base( const int before_size_,
pos_limit = buffer_size;
if( !at_stream_end ) pos_limit -= after_size;
unsigned size = 1 << std::max( 16, real_bits( dictionary_size - 1 ) - 2 );
- if( dictionary_size > 1 << 26 ) // 64 MiB
- size >>= 1;
+ if( dictionary_size > 1 << 26 ) size >>= 1; // 64 MiB
key4_mask = size - 1; // increases with dictionary size
size += num_prev_positions23;
num_prev_positions = size;
@@ -133,8 +132,7 @@ void Matchfinder_base::reset()
{
dictionary_size = std::max( (int)min_dictionary_size, stream_pos );
int size = 1 << std::max( 16, real_bits( dictionary_size - 1 ) - 2 );
- if( dictionary_size > 1 << 26 ) // 64 MiB
- size >>= 1;
+ if( dictionary_size > 1 << 26 ) size >>= 1; // 64 MiB
key4_mask = size - 1;
size += num_prev_positions23;
num_prev_positions = size;