brotli 0.1.3 → 0.1.4

data/vendor/brotli/enc/streams.cc

@@ -4,14 +4,14 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Convience routines to make Brotli I/O classes from some memory containers and
-// files.
+/* Convience routines to make Brotli I/O classes from some memory containers and
+   files. */
 
 #include "./streams.h"
 
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
+#include <string.h>  /* memcpy */
 
 namespace brotli {
 
@@ -26,7 +26,7 @@ void BrotliMemOut::Reset(void* buf, size_t len) {
   pos_ = 0;
 }
 
-// Brotli output routine: copy n bytes to the output buffer.
+/* Brotli output routine: copy n bytes to the output buffer. */
 bool BrotliMemOut::Write(const void *buf, size_t n) {
   if (n + pos_ > len_)
     return false;
@@ -47,7 +47,7 @@ void BrotliStringOut::Reset(std::string* buf, size_t max_size) {
   max_size_ = max_size;
 }
 
-// Brotli output routine: add n bytes to a string.
+/* Brotli output routine: add n bytes to a string. */
 bool BrotliStringOut::Write(const void *buf, size_t n) {
   if (buf_->size() + n > max_size_)
     return false;
@@ -66,7 +66,7 @@ void BrotliMemIn::Reset(const void* buf, size_t len) {
   pos_ = 0;
 }
 
-// Brotli input routine: read the next chunk of memory.
+/* Brotli input routine: read the next chunk of memory. */
 const void* BrotliMemIn::Read(size_t n, size_t* output) {
   if (pos_ == len_) {
     return NULL;
@@ -111,4 +111,4 @@ bool BrotliFileOut::Write(const void* buf, size_t n) {
   return true;
 }
 
-}  // namespace brotli
+}  /* namespace brotli */

data/vendor/brotli/enc/streams.h

@@ -4,83 +4,83 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Input and output classes for streaming brotli compression.
+/* Input and output classes for streaming brotli compression. */
 
 #ifndef BROTLI_ENC_STREAMS_H_
 #define BROTLI_ENC_STREAMS_H_
 
 #include <stdio.h>
 #include <string>
-#include "./port.h"
-#include "./types.h"
+
+#include "../common/types.h"
 
 namespace brotli {
 
-// Input interface for the compression routines.
+/* Input interface for the compression routines. */
 class BrotliIn {
  public:
   virtual ~BrotliIn(void) {}
 
-  // Return a pointer to the next block of input of at most n bytes.
-  // Return the actual length in *nread.
-  // At end of data, return NULL. Don't return NULL if there is more data
-  // to read, even if called with n == 0.
-  // Read will only be called if some of its bytes are needed.
+  /* Return a pointer to the next block of input of at most n bytes.
+     Return the actual length in *nread.
+     At end of data, return NULL. Don't return NULL if there is more data
+     to read, even if called with n == 0.
+     Read will only be called if some of its bytes are needed. */
   virtual const void* Read(size_t n, size_t* nread) = 0;
 };
 
-// Output interface for the compression routines.
+/* Output interface for the compression routines. */
 class BrotliOut {
  public:
   virtual ~BrotliOut(void) {}
 
-  // Write n bytes of data from buf.
-  // Return true if all written, false otherwise.
+  /* Write n bytes of data from buf.
+     Return true if all written, false otherwise. */
   virtual bool Write(const void *buf, size_t n) = 0;
 };
 
-// Adapter class to make BrotliIn objects from raw memory.
+/* Adapter class to make BrotliIn objects from raw memory. */
 class BrotliMemIn : public BrotliIn {
  public:
   BrotliMemIn(const void* buf, size_t len);
 
   void Reset(const void* buf, size_t len);
 
-  // returns the amount of data consumed
+  /* returns the amount of data consumed */
   size_t position(void) const { return pos_; }
 
   const void* Read(size_t n, size_t* OUTPUT);
 
  private:
-  const void* buf_;  // start of input buffer
-  size_t len_;  // length of input
-  size_t pos_;  // current read position within input
+  const void* buf_;  /* start of input buffer */
+  size_t len_;  /* length of input */
+  size_t pos_;  /* current read position within input */
 };
 
-// Adapter class to make BrotliOut objects from raw memory.
+/* Adapter class to make BrotliOut objects from raw memory. */
 class BrotliMemOut : public BrotliOut {
  public:
   BrotliMemOut(void* buf, size_t len);
 
   void Reset(void* buf, size_t len);
 
-  // returns the amount of data written
+  /* returns the amount of data written */
   size_t position(void) const { return pos_; }
 
   bool Write(const void* buf, size_t n);
 
  private:
-  void* buf_;  // start of output buffer
-  size_t len_;  // length of output
-  size_t pos_;  // current write position within output
+  void* buf_;  /* start of output buffer */
+  size_t len_;  /* length of output */
+  size_t pos_;  /* current write position within output */
 };
 
-// Adapter class to make BrotliOut objects from a string.
+/* Adapter class to make BrotliOut objects from a string. */
 class BrotliStringOut : public BrotliOut {
  public:
-  // Create a writer that appends its data to buf.
-  // buf->size() will grow to at most max_size
-  // buf is expected to be empty when constructing BrotliStringOut.
+  /* Create a writer that appends its data to buf.
+     buf->size() will grow to at most max_size
+     buf is expected to be empty when constructing BrotliStringOut. */
   BrotliStringOut(std::string* buf, size_t max_size);
 
   void Reset(std::string* buf, size_t max_len);
@@ -88,11 +88,11 @@ class BrotliStringOut : public BrotliOut {
   bool Write(const void* buf, size_t n);
 
  private:
-  std::string* buf_;  // start of output buffer
-  size_t max_size_;  // max length of output
+  std::string* buf_;  /* start of output buffer */
+  size_t max_size_;  /* max length of output */
 };
 
-// Adapter class to make BrotliIn object from a file.
+/* Adapter class to make BrotliIn object from a file. */
 class BrotliFileIn : public BrotliIn {
  public:
   BrotliFileIn(FILE* f, size_t max_read_size);
@@ -106,7 +106,7 @@ class BrotliFileIn : public BrotliIn {
   size_t buf_size_;
 };
 
-// Adapter class to make BrotliOut object from a file.
+/* Adapter class to make BrotliOut object from a file. */
 class BrotliFileOut : public BrotliOut {
  public:
   explicit BrotliFileOut(FILE* f);
@@ -116,6 +116,6 @@ class BrotliFileOut : public BrotliOut {
   FILE* f_;
 };
 
-}  // namespace brotli
+}  /* namespace brotli */
 
-#endif  // BROTLI_ENC_STREAMS_H_
+#endif  /* BROTLI_ENC_STREAMS_H_ */

data/vendor/brotli/enc/{utf8_util.cc → utf8_util.c}

@@ -4,25 +4,26 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Heuristics for deciding about the UTF8-ness of strings.
+/* Heuristics for deciding about the UTF8-ness of strings. */
 
 #include "./utf8_util.h"
 
-#include "./types.h"
+#include "../common/types.h"
 
-namespace brotli {
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
 
-namespace {
-
-size_t ParseAsUTF8(int* symbol, const uint8_t* input, size_t size) {
-  // ASCII
+static size_t BrotliParseAsUTF8(
+    int* symbol, const uint8_t* input, size_t size) {
+  /* ASCII */
   if ((input[0] & 0x80) == 0) {
     *symbol = input[0];
     if (*symbol > 0) {
       return 1;
     }
   }
-  // 2-byte UTF8
+  /* 2-byte UTF8 */
   if (size > 1u &&
       (input[0] & 0xe0) == 0xc0 &&
       (input[1] & 0xc0) == 0x80) {
@@ -32,7 +33,7 @@ size_t ParseAsUTF8(int* symbol, const uint8_t* input, size_t size) {
       return 2;
     }
   }
-  // 3-byte UFT8
+  /* 3-byte UFT8 */
   if (size > 2u &&
       (input[0] & 0xf0) == 0xe0 &&
       (input[1] & 0xc0) == 0x80 &&
@@ -44,7 +45,7 @@ size_t ParseAsUTF8(int* symbol, const uint8_t* input, size_t size) {
       return 3;
     }
   }
-  // 4-byte UFT8
+  /* 4-byte UFT8 */
   if (size > 3u &&
       (input[0] & 0xf8) == 0xf0 &&
       (input[1] & 0xc0) == 0x80 &&
@@ -58,26 +59,27 @@ size_t ParseAsUTF8(int* symbol, const uint8_t* input, size_t size) {
       return 4;
     }
   }
-  // Not UTF8, emit a special symbol above the UTF8-code space
+  /* Not UTF8, emit a special symbol above the UTF8-code space */
   *symbol = 0x110000 | input[0];
   return 1;
 }
 
-}  // namespace
-
-// Returns true if at least min_fraction of the data is UTF8-encoded.
-bool IsMostlyUTF8(const uint8_t* data, const size_t pos, const size_t mask,
-                  const size_t length, const double min_fraction) {
+/* Returns 1 if at least min_fraction of the data is UTF8-encoded.*/
+BROTLI_BOOL BrotliIsMostlyUTF8(
+    const uint8_t* data, const size_t pos, const size_t mask,
+    const size_t length, const double min_fraction) {
   size_t size_utf8 = 0;
   size_t i = 0;
   while (i < length) {
     int symbol;
-    size_t bytes_read = ParseAsUTF8(
-        &symbol, &data[(pos + i) & mask], length - i);
+    size_t bytes_read =
+        BrotliParseAsUTF8(&symbol, &data[(pos + i) & mask], length - i);
     i += bytes_read;
     if (symbol < 0x110000) size_utf8 += bytes_read;
   }
-  return size_utf8 > min_fraction * static_cast<double>(length);
+  return TO_BROTLI_BOOL(size_utf8 > min_fraction * (double)length);
 }
 
-}  // namespace brotli
+#if defined(__cplusplus) || defined(c_plusplus)
+}  /* extern "C" */
+#endif

data/vendor/brotli/enc/utf8_util.h

@@ -4,22 +4,29 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Heuristics for deciding about the UTF8-ness of strings.
+/* Heuristics for deciding about the UTF8-ness of strings. */
 
 #ifndef BROTLI_ENC_UTF8_UTIL_H_
 #define BROTLI_ENC_UTF8_UTIL_H_
 
-#include "./types.h"
+#include "../common/types.h"
+#include "./port.h"
 
-namespace brotli {
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
 
 static const double kMinUTF8Ratio = 0.75;
 
-// Returns true if at least min_fraction of the bytes between pos and
-// pos + length in the (data, mask) ringbuffer is UTF8-encoded.
-bool IsMostlyUTF8(const uint8_t* data, const size_t pos, const size_t mask,
-                  const size_t length, const double min_fraction);
+/* Returns 1 if at least min_fraction of the bytes between pos and
+   pos + length in the (data, mask) ringbuffer is UTF8-encoded, otherwise
+   returns 0. */
+BROTLI_INTERNAL BROTLI_BOOL BrotliIsMostlyUTF8(
+    const uint8_t* data, const size_t pos, const size_t mask,
+    const size_t length, const double min_fraction);
 
-}  // namespace brotli
+#if defined(__cplusplus) || defined(c_plusplus)
+}  /* extern "C" */
+#endif
 
-#endif  // BROTLI_ENC_UTF8_UTIL_H_
+#endif  /* BROTLI_ENC_UTF8_UTIL_H_ */

data/vendor/brotli/enc/write_bits.h

@@ -4,74 +4,78 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-// Write bits into a byte array.
+/* Write bits into a byte array. */
 
 #ifndef BROTLI_ENC_WRITE_BITS_H_
 #define BROTLI_ENC_WRITE_BITS_H_
 
 #include <assert.h>
-#include <stdio.h>
+#include <stdio.h>  /* printf */
 
+#include "../common/types.h"
 #include "./port.h"
-#include "./types.h"
-
-namespace brotli {
-
-//#define BIT_WRITER_DEBUG
-
-// This function writes bits into bytes in increasing addresses, and within
-// a byte least-significant-bit first.
-//
-// The function can write up to 56 bits in one go with WriteBits
-// Example: let's assume that 3 bits (Rs below) have been written already:
-//
-// BYTE-0     BYTE+1       BYTE+2
-//
-// 0000 0RRR    0000 0000    0000 0000
-//
-// Now, we could write 5 or less bits in MSB by just sifting by 3
-// and OR'ing to BYTE-0.
-//
-// For n bits, we take the last 5 bits, OR that with high bits in BYTE-0,
-// and locate the rest in BYTE+1, BYTE+2, etc.
-inline void WriteBits(size_t n_bits,
-                      uint64_t bits,
-                      size_t * __restrict pos,
-                      uint8_t * __restrict array) {
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+/*#define BIT_WRITER_DEBUG */
+
+/* This function writes bits into bytes in increasing addresses, and within
+   a byte least-significant-bit first.
+
+   The function can write up to 56 bits in one go with WriteBits
+   Example: let's assume that 3 bits (Rs below) have been written already:
+
+   BYTE-0     BYTE+1       BYTE+2
+
+   0000 0RRR    0000 0000    0000 0000
+
+   Now, we could write 5 or less bits in MSB by just sifting by 3
+   and OR'ing to BYTE-0.
+
+   For n bits, we take the last 5 bits, OR that with high bits in BYTE-0,
+   and locate the rest in BYTE+1, BYTE+2, etc. */
+static BROTLI_INLINE void BrotliWriteBits(size_t n_bits,
+                                          uint64_t bits,
+                                          size_t * BROTLI_RESTRICT pos,
+                                          uint8_t * BROTLI_RESTRICT array) {
+#ifdef IS_LITTLE_ENDIAN
+  /* This branch of the code can write up to 56 bits at a time,
+     7 bits are lost by being perhaps already in *p and at least
+     1 bit is needed to initialize the bit-stream ahead (i.e. if 7
+     bits are in *p and we write 57 bits, then the next write will
+     access a byte that was never initialized). */
+  uint8_t *p = &array[*pos >> 3];
+  uint64_t v = *p;
 #ifdef BIT_WRITER_DEBUG
   printf("WriteBits  %2d  0x%016llx  %10d\n", n_bits, bits, *pos);
 #endif
   assert((bits >> n_bits) == 0);
   assert(n_bits <= 56);
-#ifdef IS_LITTLE_ENDIAN
-  // This branch of the code can write up to 56 bits at a time,
-  // 7 bits are lost by being perhaps already in *p and at least
-  // 1 bit is needed to initialize the bit-stream ahead (i.e. if 7
-  // bits are in *p and we write 57 bits, then the next write will
-  // access a byte that was never initialized).
-  uint8_t *p = &array[*pos >> 3];
-  uint64_t v = *p;
   v |= bits << (*pos & 7);
-  BROTLI_UNALIGNED_STORE64(p, v);  // Set some bits.
+  BROTLI_UNALIGNED_STORE64(p, v);  /* Set some bits. */
   *pos += n_bits;
 #else
-  // implicit & 0xff is assumed for uint8_t arithmetics
+  /* implicit & 0xff is assumed for uint8_t arithmetics */
   uint8_t *array_pos = &array[*pos >> 3];
   const size_t bits_reserved_in_first_byte = (*pos & 7);
+  size_t bits_left_to_write;
   bits <<= bits_reserved_in_first_byte;
-  *array_pos++ |= static_cast<uint8_t>(bits);
-  for (size_t bits_left_to_write = n_bits + bits_reserved_in_first_byte;
+  *array_pos++ |= (uint8_t)bits;
+  for (bits_left_to_write = n_bits + bits_reserved_in_first_byte;
        bits_left_to_write >= 9;
        bits_left_to_write -= 8) {
     bits >>= 8;
-    *array_pos++ = static_cast<uint8_t>(bits);
+    *array_pos++ = (uint8_t)bits;
   }
   *array_pos = 0;
   *pos += n_bits;
 #endif
 }
 
-inline void WriteBitsPrepareStorage(size_t pos, uint8_t *array) {
+static BROTLI_INLINE void BrotliWriteBitsPrepareStorage(
+    size_t pos, uint8_t *array) {
 #ifdef BIT_WRITER_DEBUG
   printf("WriteBitsPrepareStorage            %10d\n", pos);
 #endif
@@ -79,6 +83,8 @@ inline void WriteBitsPrepareStorage(size_t pos, uint8_t *array) {
   array[pos >> 3] = 0;
 }
 
-}  // namespace brotli
+#if defined(__cplusplus) || defined(c_plusplus)
+}  /* extern "C" */
+#endif
 
-#endif  // BROTLI_ENC_WRITE_BITS_H_
+#endif  /* BROTLI_ENC_WRITE_BITS_H_ */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brotli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,20 +98,19 @@ files:
 - bin/console
 - bin/setup
 - brotli.gemspec
-- ext/brotli/brotli.cc
+- ext/brotli/brotli.c
 - ext/brotli/brotli.h
+- ext/brotli/buffer.c
+- ext/brotli/buffer.h
 - ext/brotli/extconf.rb
 - lib/brotli.rb
 - lib/brotli/version.rb
 - vendor/brotli/LICENSE
-- vendor/brotli/dec/Makefile
 - vendor/brotli/dec/bit_reader.c
 - vendor/brotli/dec/bit_reader.h
 - vendor/brotli/dec/context.h
 - vendor/brotli/dec/decode.c
 - vendor/brotli/dec/decode.h
-- vendor/brotli/dec/dictionary.c
-- vendor/brotli/dec/dictionary.h
 - vendor/brotli/dec/huffman.c
 - vendor/brotli/dec/huffman.h
 - vendor/brotli/dec/port.h
@@ -119,53 +118,63 @@ files:
 - vendor/brotli/dec/state.c
 - vendor/brotli/dec/state.h
 - vendor/brotli/dec/transform.h
-- vendor/brotli/dec/types.h
-- vendor/brotli/enc/Makefile
-- vendor/brotli/enc/backward_references.cc
+- vendor/brotli/enc/backward_references.c
 - vendor/brotli/enc/backward_references.h
+- vendor/brotli/enc/backward_references_inc.h
+- vendor/brotli/enc/bit_cost.c
 - vendor/brotli/enc/bit_cost.h
-- vendor/brotli/enc/block_splitter.cc
+- vendor/brotli/enc/bit_cost_inc.h
+- vendor/brotli/enc/block_encoder_inc.h
+- vendor/brotli/enc/block_splitter.c
 - vendor/brotli/enc/block_splitter.h
-- vendor/brotli/enc/brotli_bit_stream.cc
+- vendor/brotli/enc/block_splitter_inc.h
+- vendor/brotli/enc/brotli_bit_stream.c
 - vendor/brotli/enc/brotli_bit_stream.h
+- vendor/brotli/enc/cluster.c
 - vendor/brotli/enc/cluster.h
+- vendor/brotli/enc/cluster_inc.h
 - vendor/brotli/enc/command.h
-- vendor/brotli/enc/compress_fragment.cc
+- vendor/brotli/enc/compress_fragment.c
 - vendor/brotli/enc/compress_fragment.h
-- vendor/brotli/enc/compress_fragment_two_pass.cc
+- vendor/brotli/enc/compress_fragment_two_pass.c
 - vendor/brotli/enc/compress_fragment_two_pass.h
+- vendor/brotli/enc/compressor.cc
 - vendor/brotli/enc/compressor.h
 - vendor/brotli/enc/context.h
-- vendor/brotli/enc/dictionary.cc
-- vendor/brotli/enc/dictionary.h
 - vendor/brotli/enc/dictionary_hash.h
-- vendor/brotli/enc/encode.cc
+- vendor/brotli/enc/encode.c
 - vendor/brotli/enc/encode.h
 - vendor/brotli/enc/encode_parallel.cc
 - vendor/brotli/enc/encode_parallel.h
-- vendor/brotli/enc/entropy_encode.cc
+- vendor/brotli/enc/entropy_encode.c
 - vendor/brotli/enc/entropy_encode.h
 - vendor/brotli/enc/entropy_encode_static.h
 - vendor/brotli/enc/fast_log.h
 - vendor/brotli/enc/find_match_length.h
 - vendor/brotli/enc/hash.h
-- vendor/brotli/enc/histogram.cc
+- vendor/brotli/enc/hash_forgetful_chain_inc.h
+- vendor/brotli/enc/hash_longest_match_inc.h
+- vendor/brotli/enc/hash_longest_match_quickly_inc.h
+- vendor/brotli/enc/histogram.c
 - vendor/brotli/enc/histogram.h
-- vendor/brotli/enc/literal_cost.cc
+- vendor/brotli/enc/histogram_inc.h
+- vendor/brotli/enc/literal_cost.c
 - vendor/brotli/enc/literal_cost.h
-- vendor/brotli/enc/metablock.cc
+- vendor/brotli/enc/memory.c
+- vendor/brotli/enc/memory.h
+- vendor/brotli/enc/metablock.c
 - vendor/brotli/enc/metablock.h
+- vendor/brotli/enc/metablock_inc.h
 - vendor/brotli/enc/port.h
 - vendor/brotli/enc/prefix.h
+- vendor/brotli/enc/quality.h
 - vendor/brotli/enc/ringbuffer.h
-- vendor/brotli/enc/static_dict.cc
+- vendor/brotli/enc/static_dict.c
 - vendor/brotli/enc/static_dict.h
 - vendor/brotli/enc/static_dict_lut.h
 - vendor/brotli/enc/streams.cc
 - vendor/brotli/enc/streams.h
-- vendor/brotli/enc/transform.h
-- vendor/brotli/enc/types.h
-- vendor/brotli/enc/utf8_util.cc
+- vendor/brotli/enc/utf8_util.c
 - vendor/brotli/enc/utf8_util.h
 - vendor/brotli/enc/write_bits.h
 homepage: https://github.com/miyucy/brotli
@@ -187,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Brotli compressor/decompressor