diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:00:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:00:02 +0000 |
| commit | 87ecf0660c0e11efa9eab93b8b20cf251de08d21 (patch) | |
| tree | 83b393486d489834d8831512a00322fff50ade33 /fast_encoder.cc | |
| parent | Adding debian version 1.15~pre3-1. (diff) | |
| download | lzip-87ecf0660c0e11efa9eab93b8b20cf251de08d21.tar.xz lzip-87ecf0660c0e11efa9eab93b8b20cf251de08d21.zip | |
Merging upstream version 1.15~rc1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'fast_encoder.cc')
| -rw-r--r-- | fast_encoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fast_encoder.cc b/fast_encoder.cc index 21e1a2b..dfbb429 100644 --- a/fast_encoder.cc +++ b/fast_encoder.cc @@ -133,7 +133,7 @@ bool FLZ_encoder::encode_member( const unsigned long long member_size ) const uint8_t cur_byte = fmatchfinder[0]; renc.encode_bit( bm_match[state()][0], 0 ); encode_literal( prev_byte, cur_byte ); - crc32.update( crc_, cur_byte ); + crc32.update_byte( crc_, cur_byte ); fmatchfinder.longest_match_len( 1 ); } @@ -153,7 +153,7 @@ bool FLZ_encoder::encode_member( const unsigned long long member_size ) } if( len > min_match_len && len + 4 > main_len ) { - crc32.update( crc_, fmatchfinder.ptr_to_current_pos(), len ); + crc32.update_buf( crc_, fmatchfinder.ptr_to_current_pos(), len ); renc.encode_bit( bm_match[state()][pos_state], 1 ); renc.encode_bit( bm_rep[state()], 1 ); const bool bit = ( dis == 0 ); @@ -178,7 +178,7 @@ bool FLZ_encoder::encode_member( const unsigned long long member_size ) if( main_len > min_match_len || ( main_len == min_match_len && match_distance < modeled_distances ) ) { - crc32.update( crc_, fmatchfinder.ptr_to_current_pos(), main_len ); + crc32.update_buf( crc_, fmatchfinder.ptr_to_current_pos(), main_len ); dis = match_distance; renc.encode_bit( bm_match[state()][pos_state], 1 ); renc.encode_bit( bm_rep[state()], 0 ); @@ -193,7 +193,7 @@ bool FLZ_encoder::encode_member( const unsigned long long member_size ) const uint8_t prev_byte = fmatchfinder[-1]; const uint8_t cur_byte = fmatchfinder[0]; const uint8_t match_byte = fmatchfinder[-reps[0]-1]; - crc32.update( crc_, cur_byte ); + crc32.update_byte( crc_, cur_byte ); fmatchfinder.move_pos(); if( match_byte == cur_byte ) |