Merging upstream version 1.25~rc1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/encoder.cc b/encoder.cc
index 11da3a0..a84ad02 100644
--- a/encoder.cc
+++ b/encoder.cc
@@ -478,7 +478,7 @@ bool LZ_encoder::encode_member( const unsigned long long member_size )
   {
   const unsigned long long member_size_limit =
     member_size - Lzip_trailer::size - max_marker_size;
-  const bool best = ( match_len_limit > 12 );
+  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;
   const int price_count = ( match_len_limit > 36 ) ? 1013 : 4093;
@@ -529,7 +529,7 @@ bool LZ_encoder::encode_member( const unsigned long long member_size )
       const int len = trials[i].price;
       int dis = trials[i].dis4;
 
-      bool bit = ( dis < 0 );
+      bool bit = dis < 0;
       renc.encode_bit( bm_match[state()][pos_state], !bit );
       if( bit )					// literal byte
         {
@@ -548,11 +548,11 @@ bool LZ_encoder::encode_member( const unsigned long long member_size )
         {
         crc32.update_buf( crc_, ptr_to_current_pos() - ahead, len );
         mtf_reps( dis, reps );
-        bit = ( dis < num_rep_distances );
+        bit = dis < num_rep_distances;
         renc.encode_bit( bm_rep[state()], bit );
         if( bit )				// repeated match
           {
-          bit = ( dis == 0 );
+          bit = dis == 0;
           renc.encode_bit( bm_rep0[state()], !bit );
           if( bit )
             renc.encode_bit( bm_len[state()][pos_state], len > 1 );