Merging upstream version 1.17~rc2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
93ad4e56ce
commit
36c7129c83
12 changed files with 126 additions and 100 deletions
20
decoder.h
20
decoder.h
|
@ -19,12 +19,12 @@ class Range_decoder
|
|||
{
|
||||
enum { buffer_size = 16384 };
|
||||
unsigned long long partial_member_pos;
|
||||
uint8_t * const buffer; // input buffer
|
||||
int pos; // current pos in buffer
|
||||
int stream_pos; // when reached, a new block must be read
|
||||
uint8_t * const buffer; /* input buffer */
|
||||
int pos; /* current pos in buffer */
|
||||
int stream_pos; /* when reached, a new block must be read */
|
||||
uint32_t code;
|
||||
uint32_t range;
|
||||
const int infd; // input file descriptor
|
||||
const int infd; /* input file descriptor */
|
||||
bool at_stream_end;
|
||||
|
||||
bool read_block();
|
||||
|
@ -215,24 +215,24 @@ class LZ_decoder
|
|||
Range_decoder & rdec;
|
||||
const unsigned dictionary_size;
|
||||
const int buffer_size;
|
||||
uint8_t * const buffer; // output buffer
|
||||
int pos; // current pos in buffer
|
||||
int stream_pos; // first byte not yet written to file
|
||||
uint8_t * const buffer; /* output buffer */
|
||||
int pos; /* current pos in buffer */
|
||||
int stream_pos; /* first byte not yet written to file */
|
||||
uint32_t crc_;
|
||||
const int outfd; // output file descriptor
|
||||
const int outfd; /* output file descriptor */
|
||||
|
||||
unsigned long long stream_position() const
|
||||
{ return partial_data_pos + stream_pos; }
|
||||
void flush_data();
|
||||
bool verify_trailer( const Pretty_print & pp ) const;
|
||||
|
||||
uint8_t get_prev_byte() const
|
||||
uint8_t peek_prev() const
|
||||
{
|
||||
const int i = ( ( pos > 0 ) ? pos : buffer_size ) - 1;
|
||||
return buffer[i];
|
||||
}
|
||||
|
||||
uint8_t get_byte( const int distance ) const
|
||||
uint8_t peek( const int distance ) const
|
||||
{
|
||||
int i = pos - distance - 1;
|
||||
if( i < 0 ) i += buffer_size;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue