diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
| commit | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (patch) | |
| tree | 9b761a21eb924915e51c2d803208e6c01b505a45 /modules/brotli/enc/entropy_encode.h | |
| parent | e1db27e19989db11fef70f439cf95821316535b3 (diff) | |
| parent | ca9abcdf1702c37bf00048dab3f460b2252873a3 (diff) | |
| download | UXP-8dd3f67b8431f42fd367a7f64a1c14ba7ba708ec.tar UXP-8dd3f67b8431f42fd367a7f64a1c14ba7ba708ec.tar.gz UXP-8dd3f67b8431f42fd367a7f64a1c14ba7ba708ec.tar.lz UXP-8dd3f67b8431f42fd367a7f64a1c14ba7ba708ec.tar.xz UXP-8dd3f67b8431f42fd367a7f64a1c14ba7ba708ec.zip | |
Merge branch 'redwood' into releaseRELBASE_20201124RELBASE_20201120RC_20201120
Diffstat (limited to 'modules/brotli/enc/entropy_encode.h')
| -rw-r--r-- | modules/brotli/enc/entropy_encode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/brotli/enc/entropy_encode.h b/modules/brotli/enc/entropy_encode.h index f23d9c379..9618e1d35 100644 --- a/modules/brotli/enc/entropy_encode.h +++ b/modules/brotli/enc/entropy_encode.h @@ -76,12 +76,12 @@ BROTLI_INTERNAL void BrotliConvertBitDepthsToSymbols(const uint8_t* depth, size_t len, uint16_t* bits); +BROTLI_INTERNAL extern const size_t kBrotliShellGaps[6]; /* Input size optimized Shell sort. */ typedef BROTLI_BOOL (*HuffmanTreeComparator)( const HuffmanTree*, const HuffmanTree*); static BROTLI_INLINE void SortHuffmanTreeItems(HuffmanTree* items, const size_t n, HuffmanTreeComparator comparator) { - static const size_t gaps[] = {132, 57, 23, 10, 4, 1}; if (n < 13) { /* Insertion sort. */ size_t i; @@ -101,7 +101,7 @@ static BROTLI_INLINE void SortHuffmanTreeItems(HuffmanTree* items, /* Shell sort. */ int g = n < 57 ? 2 : 0; for (; g < 6; ++g) { - size_t gap = gaps[g]; + size_t gap = kBrotliShellGaps[g]; size_t i; for (i = gap; i < n; ++i) { size_t j = i; |