From 287887ae1eaaa75243f2adbff20b816b8fc7a381 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 06:06:11 +0100 Subject: Merging upstream version 1.5. Signed-off-by: Daniel Baumann --- decoder.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'decoder.h') diff --git a/decoder.h b/decoder.h index 3b97014..d6162d8 100644 --- a/decoder.h +++ b/decoder.h @@ -158,7 +158,7 @@ static inline int Rd_decode_tree6( struct Range_decoder * const rdec, symbol = ( symbol << 1 ) | Rd_decode_bit( rdec, &bm[symbol] ); symbol = ( symbol << 1 ) | Rd_decode_bit( rdec, &bm[symbol] ); symbol = ( symbol << 1 ) | Rd_decode_bit( rdec, &bm[symbol] ); - return symbol - (1 << 6); + return symbol & 0x3F; } static inline int Rd_decode_tree_reversed( struct Range_decoder * const rdec, @@ -256,9 +256,6 @@ struct LZ_decoder void LZd_flush_data( struct LZ_decoder * const d ); -bool LZd_verify_trailer( struct LZ_decoder * const d, - struct Pretty_print * const pp ); - int seek_read( const int fd, uint8_t * const buf, const int size, const int offset ); -- cgit v1.2.3