From 5fcb0d00fb1cdc480ceae6aff80d0ed3ddd602cf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 29 May 2016 19:17:10 +0200 Subject: Merging upstream version 1.8. Signed-off-by: Daniel Baumann --- encoder_base.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'encoder_base.h') diff --git a/encoder_base.h b/encoder_base.h index a72442f..54fecd1 100644 --- a/encoder_base.h +++ b/encoder_base.h @@ -1,5 +1,5 @@ /* Clzip - LZMA lossless data compressor - Copyright (C) 2010-2015 Antonio Diaz Diaz. + Copyright (C) 2010-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 @@ -113,8 +113,7 @@ static inline int price_symbol_reversed( const Bit_model bm[], int symbol, } -static inline int price_matched( const Bit_model bm[], int symbol, - int match_byte ) +static inline int price_matched( const Bit_model bm[], int symbol, int match_byte ) { int price = 0; int mask = 0x100; @@ -409,8 +408,8 @@ static inline bool LZeb_init( struct LZ_encoder_base * const eb, const int before, const int dict_size, const int after_size, const int dict_factor, const int num_prev_positions23, - const int pos_array_factor, const int ifd, - const int outfd ) + const int pos_array_factor, + const int ifd, const int outfd ) { if( !Mb_init( &eb->mb, before, dict_size, after_size, dict_factor, num_prev_positions23, pos_array_factor, ifd ) ) return false; -- cgit v1.2.3