brotli 0.1.3 → 0.1.4

data/vendor/brotli/enc/compress_fragment_two_pass.h

@@ -4,37 +4,48 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Function for fast encoding of an input fragment, independently from the input
-// history. This function uses two-pass processing: in the first pass we save
-// the found backward matches and literal bytes into a buffer, and in the
-// second pass we emit them into the bit stream using prefix codes built based
-// on the actual command and literal byte histograms.
+/* Function for fast encoding of an input fragment, independently from the input
+   history. This function uses two-pass processing: in the first pass we save
+   the found backward matches and literal bytes into a buffer, and in the
+   second pass we emit them into the bit stream using prefix codes built based
+   on the actual command and literal byte histograms. */
 
 #ifndef BROTLI_ENC_COMPRESS_FRAGMENT_TWO_PASS_H_
 #define BROTLI_ENC_COMPRESS_FRAGMENT_TWO_PASS_H_
 
-#include "./types.h"
+#include "../common/types.h"
+#include "./memory.h"
+#include "./port.h"
 
-namespace brotli {
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
 
 static const size_t kCompressFragmentTwoPassBlockSize = 1 << 17;
 
-// Compresses "input" string to the "*storage" buffer as one or more complete
-// meta-blocks, and updates the "*storage_ix" bit position.
-//
-// If "is_last" is true, emits an additional empty last meta-block.
-//
-// REQUIRES: "input_size" is greater than zero, or "is_last" is true.
-// REQUIRES: "command_buf" and "literal_buf" point to at least
-//            kCompressFragmentTwoPassBlockSize long arrays.
-// REQUIRES: All elements in "table[0..table_size-1]" are initialized to zero.
-// REQUIRES: "table_size" is a power of two
-void BrotliCompressFragmentTwoPass(const uint8_t* input, size_t input_size,
-                                   bool is_last,
-                                   uint32_t* command_buf, uint8_t* literal_buf,
-                                   int* table, size_t table_size,
-                                   size_t* storage_ix, uint8_t* storage);
-
-}  // namespace brotli
-
-#endif  // BROTLI_ENC_COMPRESS_FRAGMENT_TWO_PASS_H_
+/* Compresses "input" string to the "*storage" buffer as one or more complete
+   meta-blocks, and updates the "*storage_ix" bit position.
+
+   If "is_last" is 1, emits an additional empty last meta-block.
+
+   REQUIRES: "input_size" is greater than zero, or "is_last" is 1.
+   REQUIRES: "command_buf" and "literal_buf" point to at least
+              kCompressFragmentTwoPassBlockSize long arrays.
+   REQUIRES: All elements in "table[0..table_size-1]" are initialized to zero.
+   REQUIRES: "table_size" is a power of two */
+BROTLI_INTERNAL void BrotliCompressFragmentTwoPass(MemoryManager* m,
+                                                   const uint8_t* input,
+                                                   size_t input_size,
+                                                   BROTLI_BOOL is_last,
+                                                   uint32_t* command_buf,
+                                                   uint8_t* literal_buf,
+                                                   int* table,
+                                                   size_t table_size,
+                                                   size_t* storage_ix,
+                                                   uint8_t* storage);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}  /* extern "C" */
+#endif
+
+#endif  /* BROTLI_ENC_COMPRESS_FRAGMENT_TWO_PASS_H_ */

data/vendor/brotli/enc/compressor.cc

@@ -0,0 +1,139 @@
+/* Copyright 2016 Google Inc. All Rights Reserved.
+
+   Distributed under MIT license.
+   See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+*/
+
+/* Brotli compressor API C++ wrapper and utilities. */
+
+#include "./compressor.h"
+
+#include <cstdlib>  /* exit */
+
+namespace brotli {
+
+static void SetParams(const BrotliParams* from, BrotliEncoderState* to) {
+  BrotliEncoderMode mode = BROTLI_MODE_GENERIC;
+  if (from->mode == BrotliParams::MODE_TEXT) {
+    mode = BROTLI_MODE_TEXT;
+  } else if (from->mode == BrotliParams::MODE_FONT) {
+    mode = BROTLI_MODE_FONT;
+  }
+  BrotliEncoderSetParameter(to, BROTLI_PARAM_MODE, (uint32_t)mode);
+  BrotliEncoderSetParameter(to, BROTLI_PARAM_QUALITY, (uint32_t)from->quality);
+  BrotliEncoderSetParameter(to, BROTLI_PARAM_LGWIN, (uint32_t)from->lgwin);
+  BrotliEncoderSetParameter(to, BROTLI_PARAM_LGBLOCK, (uint32_t)from->lgblock);
+}
+
+BrotliCompressor::BrotliCompressor(BrotliParams params) {
+  state_ = BrotliEncoderCreateInstance(0, 0, 0);
+  if (state_ == 0) std::exit(EXIT_FAILURE);  /* OOM */
+  SetParams(&params, state_);
+}
+
+BrotliCompressor::~BrotliCompressor(void) {
+  BrotliEncoderDestroyInstance(state_);
+}
+
+bool BrotliCompressor::WriteMetaBlock(const size_t input_size,
+                                      const uint8_t* input_buffer,
+                                      const bool is_last, size_t* encoded_size,
+                                      uint8_t* encoded_buffer) {
+  return !!BrotliEncoderWriteMetaBlock(state_, input_size, input_buffer,
+                                       TO_BROTLI_BOOL(is_last), encoded_size,
+                                       encoded_buffer);
+}
+
+bool BrotliCompressor::WriteMetadata(const size_t input_size,
+                                     const uint8_t* input_buffer,
+                                     const bool is_last, size_t* encoded_size,
+                                     uint8_t* encoded_buffer) {
+  return !!BrotliEncoderWriteMetadata(state_, input_size, input_buffer,
+                                      TO_BROTLI_BOOL(is_last), encoded_size,
+                                      encoded_buffer);
+}
+
+bool BrotliCompressor::FinishStream(size_t* encoded_size,
+                                    uint8_t* encoded_buffer) {
+  return !!BrotliEncoderFinishStream(state_, encoded_size, encoded_buffer);
+}
+
+void BrotliCompressor::CopyInputToRingBuffer(const size_t input_size,
+                                             const uint8_t* input_buffer) {
+  BrotliEncoderCopyInputToRingBuffer(state_, input_size, input_buffer);
+}
+
+bool BrotliCompressor::WriteBrotliData(const bool is_last,
+                                       const bool force_flush, size_t* out_size,
+                                       uint8_t** output) {
+  return !!BrotliEncoderWriteData(state_, TO_BROTLI_BOOL(is_last),
+      TO_BROTLI_BOOL(force_flush), out_size, output);
+}
+
+void BrotliCompressor::BrotliSetCustomDictionary(size_t size,
+                                                 const uint8_t* dict) {
+  BrotliEncoderSetCustomDictionary(state_, size, dict);
+}
+
+int BrotliCompressBuffer(BrotliParams params, size_t input_size,
+                         const uint8_t* input_buffer, size_t* encoded_size,
+                         uint8_t* encoded_buffer) {
+  return BrotliEncoderCompress(params.quality, params.lgwin,
+      (BrotliEncoderMode)params.mode, input_size, input_buffer,
+      encoded_size, encoded_buffer);
+}
+
+int BrotliCompress(BrotliParams params, BrotliIn* in, BrotliOut* out) {
+  return BrotliCompressWithCustomDictionary(0, 0, params, in, out);
+}
+
+int BrotliCompressWithCustomDictionary(size_t dictsize, const uint8_t* dict,
+                                       BrotliParams params, BrotliIn* in,
+                                       BrotliOut* out) {
+  const size_t kOutputBufferSize = 65536;
+  uint8_t* output_buffer;
+  bool result = true;
+  size_t available_in = 0;
+  const uint8_t* next_in = NULL;
+  size_t total_out = 0;
+  bool end_of_input = false;
+  BrotliEncoderState* s;
+
+  s = BrotliEncoderCreateInstance(0, 0, 0);
+  if (!s) return 0;
+  SetParams(&params, s);
+  BrotliEncoderSetCustomDictionary(s, dictsize, dict);
+  output_buffer = new uint8_t[kOutputBufferSize];
+
+  while (true) {
+    if (available_in == 0 && !end_of_input) {
+      next_in = reinterpret_cast<const uint8_t*>(
+          in->Read(BrotliEncoderInputBlockSize(s), &available_in));
+      if (!next_in) {
+        end_of_input = true;
+        available_in = 0;
+      } else if (available_in == 0) {
+        continue;
+      }
+    }
+    size_t available_out = kOutputBufferSize;
+    uint8_t* next_out = output_buffer;
+    result = !!BrotliEncoderCompressStream(
+        s, end_of_input ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS,
+        &available_in, &next_in, &available_out, &next_out, &total_out);
+    if (!result) break;
+    size_t used_output = kOutputBufferSize - available_out;
+    if (used_output != 0) {
+      result = out->Write(output_buffer, used_output);
+      if (!result) break;
+    }
+    if (BrotliEncoderIsFinished(s)) break;
+  }
+
+  delete[] output_buffer;
+  BrotliEncoderDestroyInstance(s);
+  return result ? 1 : 0;
+}
+
+
+}  /* namespace brotli */

data/vendor/brotli/enc/compressor.h

@@ -12,4 +12,150 @@
 #include "./encode.h"
 #include "./streams.h"
 
+namespace brotli {
+
+static const int kMinWindowBits = kBrotliMinWindowBits;
+static const int kMaxWindowBits = kBrotliMaxWindowBits;
+static const int kMinInputBlockBits = kBrotliMinInputBlockBits;
+static const int kMaxInputBlockBits = kBrotliMaxInputBlockBits;
+
+struct BrotliParams {
+  BrotliParams(void)
+      : mode(MODE_GENERIC),
+        quality(11),
+        lgwin(22),
+        lgblock(0),
+        enable_dictionary(true),
+        enable_transforms(false),
+        greedy_block_split(false),
+        enable_context_modeling(true) {}
+
+  enum Mode {
+    /* Default compression mode. The compressor does not know anything in
+       advance about the properties of the input. */
+    MODE_GENERIC = 0,
+    /* Compression mode for UTF-8 format text input. */
+    MODE_TEXT = 1,
+    /* Compression mode used in WOFF 2.0. */
+    MODE_FONT = 2
+  };
+  Mode mode;
+
+  /* Controls the compression-speed vs compression-density tradeoffs. The higher
+     the |quality|, the slower the compression. Range is 0 to 11. */
+  int quality;
+  /* Base 2 logarithm of the sliding window size. Range is 10 to 24. */
+  int lgwin;
+  /* Base 2 logarithm of the maximum input block size. Range is 16 to 24.
+     If set to 0, the value will be set based on the quality. */
+  int lgblock;
+
+  /* These settings are deprecated and will be ignored.
+     All speed vs. size compromises are controlled by the |quality| param. */
+  bool enable_dictionary;
+  bool enable_transforms;
+  bool greedy_block_split;
+  bool enable_context_modeling;
+};
+
+/* An instance can not be reused for multiple brotli streams. */
+class BrotliCompressor {
+ public:
+  explicit BrotliCompressor(BrotliParams params);
+  ~BrotliCompressor(void);
+
+  /* The maximum input size that can be processed at once. */
+  size_t input_block_size(void) const {
+    return BrotliEncoderInputBlockSize(state_);
+  }
+
+  /* Encodes the data in |input_buffer| as a meta-block and writes it to
+     |encoded_buffer| (|*encoded_size should| be set to the size of
+     |encoded_buffer|) and sets |*encoded_size| to the number of bytes that
+     was written. The |input_size| must not be greater than input_block_size().
+     Returns false if there was an error and true otherwise. */
+  bool WriteMetaBlock(const size_t input_size,
+                      const uint8_t* input_buffer,
+                      const bool is_last,
+                      size_t* encoded_size,
+                      uint8_t* encoded_buffer);
+
+  /* Writes a metadata meta-block containing the given input to encoded_buffer.
+     |*encoded_size| should be set to the size of the encoded_buffer.
+     Sets |*encoded_size| to the number of bytes that was written.
+     Note that the given input data will not be part of the sliding window and
+     thus no backward references can be made to this data from subsequent
+     metablocks. |input_size| must not be greater than 2^24 and provided
+     |*encoded_size| must not be less than |input_size| + 6.
+     Returns false if there was an error and true otherwise. */
+  bool WriteMetadata(const size_t input_size,
+                     const uint8_t* input_buffer,
+                     const bool is_last,
+                     size_t* encoded_size,
+                     uint8_t* encoded_buffer);
+
+  /* Writes a zero-length meta-block with end-of-input bit set to the
+     internal output buffer and copies the output buffer to |encoded_buffer|
+     (|*encoded_size| should be set to the size of |encoded_buffer|) and sets
+     |*encoded_size| to the number of bytes written.
+     Returns false if there was an error and true otherwise. */
+  bool FinishStream(size_t* encoded_size, uint8_t* encoded_buffer);
+
+  /* Copies the given input data to the internal ring buffer of the compressor.
+     No processing of the data occurs at this time and this function can be
+     called multiple times before calling WriteBrotliData() to process the
+     accumulated input. At most input_block_size() bytes of input data can be
+     copied to the ring buffer, otherwise the next WriteBrotliData() will fail.
+   */
+  void CopyInputToRingBuffer(const size_t input_size,
+                             const uint8_t* input_buffer);
+
+  /* Processes the accumulated input data and sets |*out_size| to the length of
+     the new output meta-block, or to zero if no new output meta-block has been
+     created (in this case the processed input data is buffered internally).
+     If |*out_size| is positive, |*output| points to the start of the output
+     data. If |is_last| or |force_flush| is true, an output meta-block is always
+     created. However, until |is_last| is true encoder may retain up to 7 bits
+     of the last byte of output. To force encoder to dump the remaining bits
+     use WriteMetadata() to append an empty meta-data block.
+     Returns false if the size of the input data is larger than
+     input_block_size(). */
+  bool WriteBrotliData(const bool is_last, const bool force_flush,
+                       size_t* out_size, uint8_t** output);
+
+  /* Fills the new state with a dictionary for LZ77, warming up the ringbuffer,
+     e.g. for custom static dictionaries for data formats.
+     Not to be confused with the built-in transformable dictionary of Brotli.
+     To decode, use BrotliSetCustomDictionary() of the decoder with the same
+     dictionary. */
+  void BrotliSetCustomDictionary(size_t size, const uint8_t* dict);
+
+  /* No-op, but we keep it here for API backward-compatibility. */
+  void WriteStreamHeader(void) {}
+
+ private:
+  BrotliEncoderState* state_;
+};
+
+/* Compresses the data in |input_buffer| into |encoded_buffer|, and sets
+   |*encoded_size| to the compressed length.
+   Returns 0 if there was an error and 1 otherwise. */
+int BrotliCompressBuffer(BrotliParams params,
+                         size_t input_size,
+                         const uint8_t* input_buffer,
+                         size_t* encoded_size,
+                         uint8_t* encoded_buffer);
+
+/* Same as above, but uses the specified input and output classes instead
+   of reading from and writing to pre-allocated memory buffers. */
+int BrotliCompress(BrotliParams params, BrotliIn* in, BrotliOut* out);
+
+/* Before compressing the data, sets a custom LZ77 dictionary with
+   BrotliCompressor::BrotliSetCustomDictionary. */
+int BrotliCompressWithCustomDictionary(size_t dictsize, const uint8_t* dict,
+                                       BrotliParams params,
+                                       BrotliIn* in, BrotliOut* out);
+
+}  /* namespace brotli */
+
 #endif  /* BROTLI_ENC_COMPRESSOR_H_ */

data/vendor/brotli/enc/context.h

@@ -4,91 +4,95 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Functions to map previous bytes into a context id.
+/* Functions to map previous bytes into a context id. */
 
 #ifndef BROTLI_ENC_CONTEXT_H_
 #define BROTLI_ENC_CONTEXT_H_
 
-#include "./types.h"
-
-namespace brotli {
-
-// Second-order context lookup table for UTF8 byte streams.
-//
-// If p1 and p2 are the previous two bytes, we calculate the context as
-//
-//   context = kUTF8ContextLookup[p1] | kUTF8ContextLookup[p2 + 256].
-//
-// If the previous two bytes are ASCII characters (i.e. < 128), this will be
-// equivalent to
-//
-//   context = 4 * context1(p1) + context2(p2),
-//
-// where context1 is based on the previous byte in the following way:
-//
-//   0  : non-ASCII control
-//   1  : \t, \n, \r
-//   2  : space
-//   3  : other punctuation
-//   4  : " '
-//   5  : %
-//   6  : ( < [ {
-//   7  : ) > ] }
-//   8  : , ; :
-//   9  : .
-//   10 : =
-//   11 : number
-//   12 : upper-case vowel
-//   13 : upper-case consonant
-//   14 : lower-case vowel
-//   15 : lower-case consonant
-//
-// and context2 is based on the second last byte:
-//
-//   0 : control, space
-//   1 : punctuation
-//   2 : upper-case letter, number
-//   3 : lower-case letter
-//
-// If the last byte is ASCII, and the second last byte is not (in a valid UTF8
-// stream it will be a continuation byte, value between 128 and 191), the
-// context is the same as if the second last byte was an ASCII control or space.
-//
-// If the last byte is a UTF8 lead byte (value >= 192), then the next byte will
-// be a continuation byte and the context id is 2 or 3 depending on the LSB of
-// the last byte and to a lesser extent on the second last byte if it is ASCII.
-//
-// If the last byte is a UTF8 continuation byte, the second last byte can be:
-//   - continuation byte: the next byte is probably ASCII or lead byte (assuming
-//     4-byte UTF8 characters are rare) and the context id is 0 or 1.
-//   - lead byte (192 - 207): next byte is ASCII or lead byte, context is 0 or 1
-//   - lead byte (208 - 255): next byte is continuation byte, context is 2 or 3
-//
-// The possible value combinations of the previous two bytes, the range of
-// context ids and the type of the next byte is summarized in the table below:
-//
-// |--------\-----------------------------------------------------------------|
-// |         \                         Last byte                              |
-// | Second   \---------------------------------------------------------------|
-// | last byte \    ASCII            |   cont. byte        |   lead byte      |
-// |            \   (0-127)          |   (128-191)         |   (192-)         |
-// |=============|===================|=====================|==================|
-// |  ASCII      | next: ASCII/lead  |  not valid          |  next: cont.     |
-// |  (0-127)    | context: 4 - 63   |                     |  context: 2 - 3  |
-// |-------------|-------------------|---------------------|------------------|
-// |  cont. byte | next: ASCII/lead  |  next: ASCII/lead   |  next: cont.     |
-// |  (128-191)  | context: 4 - 63   |  context: 0 - 1     |  context: 2 - 3  |
-// |-------------|-------------------|---------------------|------------------|
-// |  lead byte  | not valid         |  next: ASCII/lead   |  not valid       |
-// |  (192-207)  |                   |  context: 0 - 1     |                  |
-// |-------------|-------------------|---------------------|------------------|
-// |  lead byte  | not valid         |  next: cont.        |  not valid       |
-// |  (208-)     |                   |  context: 2 - 3     |                  |
-// |-------------|-------------------|---------------------|------------------|
+#include "../common/types.h"
+#include "../common/port.h"
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+/* Second-order context lookup table for UTF8 byte streams.
+
+   If p1 and p2 are the previous two bytes, we calculate the context as
+
+     context = kUTF8ContextLookup[p1] | kUTF8ContextLookup[p2 + 256].
+
+   If the previous two bytes are ASCII characters (i.e. < 128), this will be
+   equivalent to
+
+     context = 4 * context1(p1) + context2(p2),
+
+   where context1 is based on the previous byte in the following way:
+
+     0  : non-ASCII control
+     1  : \t, \n, \r
+     2  : space
+     3  : other punctuation
+     4  : " '
+     5  : %
+     6  : ( < [ {
+     7  : ) > ] }
+     8  : , ; :
+     9  : .
+     10 : =
+     11 : number
+     12 : upper-case vowel
+     13 : upper-case consonant
+     14 : lower-case vowel
+     15 : lower-case consonant
+
+   and context2 is based on the second last byte:
+
+     0 : control, space
+     1 : punctuation
+     2 : upper-case letter, number
+     3 : lower-case letter
+
+   If the last byte is ASCII, and the second last byte is not (in a valid UTF8
+   stream it will be a continuation byte, value between 128 and 191), the
+   context is the same as if the second last byte was an ASCII control or space.
+
+   If the last byte is a UTF8 lead byte (value >= 192), then the next byte will
+   be a continuation byte and the context id is 2 or 3 depending on the LSB of
+   the last byte and to a lesser extent on the second last byte if it is ASCII.
+
+   If the last byte is a UTF8 continuation byte, the second last byte can be:
+     - continuation byte: the next byte is probably ASCII or lead byte (assuming
+       4-byte UTF8 characters are rare) and the context id is 0 or 1.
+     - lead byte (192 - 207): next byte is ASCII or lead byte, context is 0 or 1
+     - lead byte (208 - 255): next byte is continuation byte, context is 2 or 3
+
+   The possible value combinations of the previous two bytes, the range of
+   context ids and the type of the next byte is summarized in the table below:
+
+   |--------\-----------------------------------------------------------------|
+   |         \                         Last byte                              |
+   | Second   \---------------------------------------------------------------|
+   | last byte \    ASCII            |   cont. byte        |   lead byte      |
+   |            \   (0-127)          |   (128-191)         |   (192-)         |
+   |=============|===================|=====================|==================|
+   |  ASCII      | next: ASCII/lead  |  not valid          |  next: cont.     |
+   |  (0-127)    | context: 4 - 63   |                     |  context: 2 - 3  |
+   |-------------|-------------------|---------------------|------------------|
+   |  cont. byte | next: ASCII/lead  |  next: ASCII/lead   |  next: cont.     |
+   |  (128-191)  | context: 4 - 63   |  context: 0 - 1     |  context: 2 - 3  |
+   |-------------|-------------------|---------------------|------------------|
+   |  lead byte  | not valid         |  next: ASCII/lead   |  not valid       |
+   |  (192-207)  |                   |  context: 0 - 1     |                  |
+   |-------------|-------------------|---------------------|------------------|
+   |  lead byte  | not valid         |  next: cont.        |  not valid       |
+   |  (208-)     |                   |  context: 2 - 3     |                  |
+   |-------------|-------------------|---------------------|------------------|
+*/
 static const uint8_t kUTF8ContextLookup[512] = {
-  // Last byte.
-  //
-  // ASCII range.
+  /* Last byte. */
+  /* */
+  /* ASCII range. */
    0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  4,  0,  0,  4,  0,  0,
    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
    8, 12, 16, 12, 12, 20, 12, 16, 24, 28, 12, 12, 32, 12, 36, 12,
@@ -97,19 +101,19 @@ static const uint8_t kUTF8ContextLookup[512] = {
   52, 52, 52, 52, 52, 48, 52, 52, 52, 52, 52, 24, 12, 28, 12, 12,
   12, 56, 60, 60, 60, 56, 60, 60, 60, 56, 60, 60, 60, 60, 60, 56,
   60, 60, 60, 60, 60, 56, 60, 60, 60, 60, 60, 24, 12, 28, 12,  0,
-  // UTF8 continuation byte range.
+  /* UTF8 continuation byte range. */
   0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
   0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
   0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
   0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
-  // UTF8 lead byte range.
+  /* UTF8 lead byte range. */
   2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
   2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
   2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
   2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
-  // Second last byte.
-  //
-  // ASCII range.
+  /* Second last byte. */
+  /* */
+  /* ASCII range. */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -118,19 +122,19 @@ static const uint8_t kUTF8ContextLookup[512] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1,
   1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
   3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 0,
-  // UTF8 continuation byte range.
+  /* UTF8 continuation byte range. */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  // UTF8 lead byte range.
+  /* UTF8 lead byte range. */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 };
 
-// Context lookup table for small signed integers.
+/* Context lookup table for small signed integers. */
 static const uint8_t kSigned3BitContextLookup[] = {
   0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -150,29 +154,31 @@ static const uint8_t kSigned3BitContextLookup[] = {
   6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7,
 };
 
-enum ContextType {
+typedef enum ContextType {
   CONTEXT_LSB6         = 0,
   CONTEXT_MSB6         = 1,
   CONTEXT_UTF8         = 2,
   CONTEXT_SIGNED       = 3
-};
+} ContextType;
 
-static inline uint8_t Context(uint8_t p1, uint8_t p2, ContextType mode) {
+static BROTLI_INLINE uint8_t Context(uint8_t p1, uint8_t p2, ContextType mode) {
   switch (mode) {
     case CONTEXT_LSB6:
       return p1 & 0x3f;
     case CONTEXT_MSB6:
-      return static_cast<uint8_t>(p1 >> 2);
+      return (uint8_t)(p1 >> 2);
     case CONTEXT_UTF8:
       return kUTF8ContextLookup[p1] | kUTF8ContextLookup[p2 + 256];
     case CONTEXT_SIGNED:
-      return static_cast<uint8_t>((kSigned3BitContextLookup[p1] << 3) +
-                                  kSigned3BitContextLookup[p2]);
+      return (uint8_t)((kSigned3BitContextLookup[p1] << 3) +
+                       kSigned3BitContextLookup[p2]);
     default:
       return 0;
   }
 }
 
-}  // namespace brotli
+#if defined(__cplusplus) || defined(c_plusplus)
+}  /* extern "C" */
+#endif
 
-#endif  // BROTLI_ENC_CONTEXT_H_
+#endif  /* BROTLI_ENC_CONTEXT_H_ */

data/vendor/brotli/enc/dictionary_hash.h

@@ -4,14 +4,16 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Hash table on the 4-byte prefixes of static dictionary words.
+/* Hash table on the 4-byte prefixes of static dictionary words. */
 
 #ifndef BROTLI_ENC_DICTIONARY_HASH_H_
 #define BROTLI_ENC_DICTIONARY_HASH_H_
 
-#include "./types.h"
+#include "../common/types.h"
 
-namespace brotli {
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
 
 static const uint16_t kStaticDictionaryHash[] = {
   0x7d48, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -4112,6 +4114,8 @@ static const uint16_t kStaticDictionaryHash[] = {
   0x0000, 0x0000, 0x0d88, 0x4ac5, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
-}  // namespace brotli
+#if defined(__cplusplus) || defined(c_plusplus)
+}  /* extern "C" */
+#endif
 
-#endif  // BROTLI_ENC_DICTIONARY_HASH_H_
+#endif  /* BROTLI_ENC_DICTIONARY_HASH_H_ */