AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2024-11-26 05:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #305 from szabadka/master

Browse Source 
Reorder members of the Command struct plus fix some warnings.
This commit is contained in:
szabadka 2016-01-26 12:16:20 +01:00
commit e998e225b7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
enc/brotli_bit_stream.cc
View File

@ -655,8 +655,8 @@ void StoreTrivialContextMap(size_t num_types,
uint8_t* storage) {
StoreVarLenUint8(num_types - 1, storage_ix, storage);
if (num_types > 1) {
size_t repeat_code = context_bits - 1;
uint64_t repeat_bits = (1 << repeat_code) - 1;
size_t repeat_code = context_bits - 1u;
size_t repeat_bits = (1u << repeat_code) - 1u;
size_t alphabet_size = num_types + repeat_code;
std::vector<uint32_t> histogram(alphabet_size);
std::vector<uint8_t> depths(alphabet_size);

6
enc/command.h
View File

@ -100,7 +100,7 @@ struct Command {
explicit Command(size_t insertlen)
: insert_len_(static_cast<uint32_t>(insertlen))
, copy_len_(0), dist_prefix_(16), dist_extra_(0) {
, copy_len_(0), dist_extra_(0), dist_prefix_(16) {
GetLengthCode(insertlen, 4, dist_prefix_ == 0, &cmd_prefix_, &cmd_extra_);
}
@ -125,10 +125,10 @@ struct Command {
uint32_t insert_len_;
uint32_t copy_len_;
uint16_t cmd_prefix_;
uint16_t dist_prefix_;
uint64_t cmd_extra_;
uint32_t dist_extra_;
uint16_t cmd_prefix_;
uint16_t dist_prefix_;
};
} // namespace brotli

1
enc/encode.cc
View File

@ -193,6 +193,7 @@ BrotliCompressor::BrotliCompressor(BrotliParams params)
storage_size_(0),
storage_(0),
large_table_(NULL),
cmd_code_numbits_(0),
command_buf_(NULL),
literal_buf_(NULL) {
// Sanitize params.