Merging upstream version 1.0.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
d24d609a01
commit
a2dab4fd78
10 changed files with 48 additions and 39 deletions
11
decoder.c
11
decoder.c
|
@ -63,7 +63,7 @@ bool LZd_verify_trailer( struct LZ_decoder * const decoder,
|
|||
struct Pretty_print * const pp )
|
||||
{
|
||||
File_trailer trailer;
|
||||
const int trailer_size = Ft_versioned_size( decoder->format_version );
|
||||
const int trailer_size = Ft_versioned_size( decoder->member_version );
|
||||
const long long member_size = LZd_member_position( decoder ) + trailer_size;
|
||||
bool error = false;
|
||||
|
||||
|
@ -83,7 +83,7 @@ bool LZd_verify_trailer( struct LZ_decoder * const decoder,
|
|||
for( ; i < trailer_size; ++i ) trailer[i] = 0;
|
||||
}
|
||||
}
|
||||
if( decoder->format_version == 0 ) Ft_set_member_size( trailer, member_size );
|
||||
if( decoder->member_version == 0 ) Ft_set_member_size( trailer, member_size );
|
||||
if( !Rd_code_is_zero( decoder->range_decoder ) )
|
||||
{
|
||||
error = true;
|
||||
|
@ -153,10 +153,11 @@ int LZd_decode_member( struct LZ_decoder * const decoder,
|
|||
{
|
||||
const uint8_t prev_byte = LZd_get_byte( decoder, 0 );
|
||||
if( St_is_char( state ) )
|
||||
LZd_put_byte( decoder, Lid_decode( &decoder->literal_decoder, decoder->range_decoder, prev_byte ) );
|
||||
LZd_put_byte( decoder, Lid_decode( &decoder->literal_decoder,
|
||||
decoder->range_decoder, prev_byte ) );
|
||||
else
|
||||
LZd_put_byte( decoder, Lid_decode_matched( &decoder->literal_decoder, decoder->range_decoder, prev_byte,
|
||||
LZd_get_byte( decoder, rep0 ) ) );
|
||||
LZd_put_byte( decoder, Lid_decode_matched( &decoder->literal_decoder,
|
||||
decoder->range_decoder, prev_byte, LZd_get_byte( decoder, rep0 ) ) );
|
||||
St_set_char( &state );
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue