zopfli 0.0.2 → 0.0.8

data/vendor/zopfli/{squeeze.h → src/zopfli/squeeze.h}

@@ -40,6 +40,7 @@ dictionary.
 */
 void ZopfliLZ77Optimal(ZopfliBlockState *s,
                        const unsigned char* in, size_t instart, size_t inend,
+                       int numiterations,
                        ZopfliLZ77Store* store);
 
 /*

data/vendor/zopfli/{util.c → src/zopfli/symbols.h}

@@ -1,5 +1,5 @@
 /*
-Copyright 2011 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,16 +17,26 @@ Author: lode.vandevenne@gmail.com (Lode Vandevenne)
 Author: jyrki.alakuijala@gmail.com (Jyrki Alakuijala)
 */
 
-#include "util.h"
+/*
+Utilities for using the lz77 symbols of the deflate spec.
+*/
 
-#include "zopfli.h"
+#ifndef ZOPFLI_SYMBOLS_H_
+#define ZOPFLI_SYMBOLS_H_
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
+/* __has_builtin available in clang */
+#ifdef __has_builtin
+# if __has_builtin(__builtin_clz)
+#   define ZOPFLI_HAS_BUILTIN_CLZ
+# endif
+/* __builtin_clz available beginning with GCC 3.4 */
+#elif __GNUC__ * 100 + __GNUC_MINOR__ >= 304
+# define ZOPFLI_HAS_BUILTIN_CLZ
+#endif
 
-int ZopfliGetDistExtraBits(int dist) {
-#ifdef __GNUC__
+/* Gets the amount of extra bits for the given dist, cfr. the DEFLATE spec. */
+static int ZopfliGetDistExtraBits(int dist) {
+#ifdef ZOPFLI_HAS_BUILTIN_CLZ
   if (dist < 5) return 0;
   return (31 ^ __builtin_clz(dist - 1)) - 1; /* log2(dist - 1) - 1 */
 #else
@@ -47,8 +57,9 @@ int ZopfliGetDistExtraBits(int dist) {
 #endif
 }
 
-int ZopfliGetDistExtraBitsValue(int dist) {
-#ifdef __GNUC__
+/* Gets value of the extra bits for the given dist, cfr. the DEFLATE spec. */
+static int ZopfliGetDistExtraBitsValue(int dist) {
+#ifdef ZOPFLI_HAS_BUILTIN_CLZ
   if (dist < 5) {
     return 0;
   } else {
@@ -73,8 +84,9 @@ int ZopfliGetDistExtraBitsValue(int dist) {
 #endif
 }
 
-int ZopfliGetDistSymbol(int dist) {
-#ifdef __GNUC__
+/* Gets the symbol for the given dist, cfr. the DEFLATE spec. */
+static int ZopfliGetDistSymbol(int dist) {
+#ifdef ZOPFLI_HAS_BUILTIN_CLZ
   if (dist < 5) {
     return dist - 1;
   } else {
@@ -122,7 +134,8 @@ int ZopfliGetDistSymbol(int dist) {
 #endif
 }
 
-int ZopfliGetLengthExtraBits(int l) {
+/* Gets the amount of extra bits for the given length, cfr. the DEFLATE spec. */
+static int ZopfliGetLengthExtraBits(int l) {
   static const int table[259] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -144,7 +157,8 @@ int ZopfliGetLengthExtraBits(int l) {
   return table[l];
 }
 
-int ZopfliGetLengthExtraBitsValue(int l) {
+/* Gets value of the extra bits for the given length, cfr. the DEFLATE spec. */
+static int ZopfliGetLengthExtraBitsValue(int l) {
   static const int table[259] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 2, 3, 0,
     1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5,
@@ -163,9 +177,10 @@ int ZopfliGetLengthExtraBitsValue(int l) {
 }
 
 /*
-Returns symbol in range [257-285] (inclusive).
+Gets the symbol for the given length, cfr. the DEFLATE spec.
+Returns the symbol in the range [257-285] (inclusive)
 */
-int ZopfliGetLengthSymbol(int l) {
+static int ZopfliGetLengthSymbol(int l) {
   static const int table[259] = {
     0, 0, 0, 257, 258, 259, 260, 261, 262, 263, 264,
     265, 265, 266, 266, 267, 267, 268, 268,
@@ -203,11 +218,22 @@ int ZopfliGetLengthSymbol(int l) {
   return table[l];
 }
 
-void ZopfliInitOptions(ZopfliOptions* options) {
-  options->verbose = 0;
-  options->verbose_more = 0;
-  options->numiterations = 15;
-  options->blocksplitting = 1;
-  options->blocksplittinglast = 0;
-  options->blocksplittingmax = 15;
+/* Gets the amount of extra bits for the given length symbol. */
+static int ZopfliGetLengthSymbolExtraBits(int s) {
+  static const int table[29] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+    3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0
+  };
+  return table[s - 257];
+}
+
+/* Gets the amount of extra bits for the given distance symbol. */
+static int ZopfliGetDistSymbolExtraBits(int s) {
+  static const int table[30] = {
+    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8,
+    9, 9, 10, 10, 11, 11, 12, 12, 13, 13
+  };
+  return table[s];
 }
+
+#endif  /* ZOPFLI_SYMBOLS_H_ */

data/vendor/zopfli/src/zopfli/util.c

@@ -0,0 +1,35 @@
+/*
+Copyright 2011 Google Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Author: lode.vandevenne@gmail.com (Lode Vandevenne)
+Author: jyrki.alakuijala@gmail.com (Jyrki Alakuijala)
+*/
+
+#include "util.h"
+
+#include "zopfli.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void ZopfliInitOptions(ZopfliOptions* options) {
+  options->verbose = 0;
+  options->verbose_more = 0;
+  options->numiterations = 15;
+  options->blocksplitting = 1;
+  options->blocksplittinglast = 0;
+  options->blocksplittingmax = 15;
+}

data/vendor/zopfli/{util.h → src/zopfli/util.h}

@@ -32,6 +32,10 @@ basic deflate specification values and generic program options.
 #define ZOPFLI_MAX_MATCH 258
 #define ZOPFLI_MIN_MATCH 3
 
+/* Number of distinct literal/length and distance symbols in DEFLATE */
+#define ZOPFLI_NUM_LL 288
+#define ZOPFLI_NUM_D 32
+
 /*
 The window size for deflate. Must be a power of two. This should be 32768, the
 maximum possible by the deflate spec. Anything less hurts compression more than
@@ -51,9 +55,9 @@ operating on huge files without exceeding memory, such as the 1GB wiki9 corpus.
 The whole compression algorithm, including the smarter block splitting, will
 be executed independently on each huge block.
 Dividing into huge blocks hurts compression, but not much relative to the size.
-Set this to, for example, 20MB (20000000). Set it to 0 to disable master blocks.
+Set it to 0 to disable master blocks.
 */
-#define ZOPFLI_MASTER_BLOCK_SIZE 20000000
+#define ZOPFLI_MASTER_BLOCK_SIZE 1000000
 
 /*
 Used to initialize costs for example
@@ -116,27 +120,6 @@ varies from file to file.
 */
 #define ZOPFLI_LAZY_MATCHING
 
-/*
-Gets the symbol for the given length, cfr. the DEFLATE spec.
-Returns the symbol in the range [257-285] (inclusive)
-*/
-int ZopfliGetLengthSymbol(int l);
-
-/* Gets the amount of extra bits for the given length, cfr. the DEFLATE spec. */
-int ZopfliGetLengthExtraBits(int l);
-
-/* Gets value of the extra bits for the given length, cfr. the DEFLATE spec. */
-int ZopfliGetLengthExtraBitsValue(int l);
-
-/* Gets the symbol for the given dist, cfr. the DEFLATE spec. */
-int ZopfliGetDistSymbol(int dist);
-
-/* Gets the amount of extra bits for the given dist, cfr. the DEFLATE spec. */
-int ZopfliGetDistExtraBits(int dist);
-
-/* Gets value of the extra bits for the given dist, cfr. the DEFLATE spec. */
-int ZopfliGetDistExtraBitsValue(int dist);
-
 /*
 Appends value to dynamically allocated memory, doubling its allocation size
 whenever needed.

data/vendor/zopfli/{zlib_container.c → src/zopfli/zlib_container.c}

@@ -53,7 +53,7 @@ void ZopfliZlibCompress(const ZopfliOptions* options,
   unsigned char bitpointer = 0;
   unsigned checksum = adler32(in, (unsigned)insize);
   unsigned cmf = 120;  /* CM 8, CINFO 7. See zlib spec.*/
-  unsigned flevel = 0;
+  unsigned flevel = 3;
   unsigned fdict = 0;
   unsigned cmfflg = 256 * cmf + fdict * 32 + flevel * 64;
   unsigned fcheck = 31 - cmfflg % 31;

data/vendor/zopfli/{zlib_container.h → src/zopfli/zlib_container.h}

@@ -26,6 +26,10 @@ Functions to compress according to the Zlib specification.
 
 #include "zopfli.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
 Compresses according to the zlib specification and append the compressed
 result to the output.
@@ -39,4 +43,8 @@ void ZopfliZlibCompress(const ZopfliOptions* options,
                         const unsigned char* in, size_t insize,
                         unsigned char** out, size_t* outsize);
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  /* ZOPFLI_ZLIB_H_ */

data/vendor/zopfli/{zopfli.h → src/zopfli/zopfli.h}

@@ -20,8 +20,13 @@ Author: jyrki.alakuijala@gmail.com (Jyrki Alakuijala)
 #ifndef ZOPFLI_ZOPFLI_H_
 #define ZOPFLI_ZOPFLI_H_
 
+#include <stddef.h>
 #include <stdlib.h> /* for size_t */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
 Options used throughout the program.
 */
@@ -47,10 +52,7 @@ typedef struct ZopfliOptions {
   int blocksplitting;
 
   /*
-  If true, chooses the optimal block split points only after doing the iterative
-  LZ77 compression. If false, chooses the block split points first, then does
-  iterative LZ77 on each individual block. Depending on the file, either first
-  or last gives the best compression. Default: false (0).
+  No longer used, left for compatibility.
   */
   int blocksplittinglast;
 
@@ -85,4 +87,8 @@ void ZopfliCompress(const ZopfliOptions* options, ZopfliFormat output_type,
                     const unsigned char* in, size_t insize,
                     unsigned char** out, size_t* outsize);
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  /* ZOPFLI_ZOPFLI_H_ */

data/vendor/zopfli/{zopfli_bin.c → src/zopfli/zopfli_bin.c}

@@ -33,20 +33,30 @@ decompressor.
 #include "gzip_container.h"
 #include "zlib_container.h"
 
+/* Windows workaround for stdout output. */
+#if _WIN32
+#include <fcntl.h>
+#endif
+
 /*
-Loads a file into a memory array.
+Loads a file into a memory array. Returns 1 on success, 0 if file doesn't exist
+or couldn't be opened.
 */
-static void LoadFile(const char* filename,
-                     unsigned char** out, size_t* outsize) {
+static int LoadFile(const char* filename,
+                    unsigned char** out, size_t* outsize) {
   FILE* file;
 
   *out = 0;
   *outsize = 0;
   file = fopen(filename, "rb");
-  if (!file) return;
+  if (!file) return 0;
 
   fseek(file , 0 , SEEK_END);
   *outsize = ftell(file);
+  if(*outsize > 2147483647) {
+    fprintf(stderr,"Files larger than 2GB are not supported.\n");
+    exit(EXIT_FAILURE);
+  }
   rewind(file);
 
   *out = (unsigned char*)malloc(*outsize);
@@ -58,11 +68,14 @@ static void LoadFile(const char* filename,
       free(*out);
       *out = 0;
       *outsize = 0;
+      fclose(file);
+      return 0;
     }
   }
 
   assert(!(*outsize) || out);  /* If size is not zero, out must be allocated. */
   fclose(file);
+  return 1;
 }
 
 /*
@@ -71,6 +84,10 @@ Saves a file from a memory array, overwriting the file if it existed.
 static void SaveFile(const char* filename,
                      const unsigned char* in, size_t insize) {
   FILE* file = fopen(filename, "wb" );
+  if (file == NULL) {
+      fprintf(stderr,"Error: Cannot write to output file, terminating.\n");
+      exit (EXIT_FAILURE);
+  }
   assert(file);
   fwrite((char*)in, 1, insize, file);
   fclose(file);
@@ -87,8 +104,7 @@ static void CompressFile(const ZopfliOptions* options,
   size_t insize;
   unsigned char* out = 0;
   size_t outsize = 0;
-  LoadFile(infilename, &in, &insize);
-  if (insize == 0) {
+  if (!LoadFile(infilename, &in, &insize)) {
     fprintf(stderr, "Invalid filename: %s\n", infilename);
     return;
   }
@@ -98,11 +114,11 @@ static void CompressFile(const ZopfliOptions* options,
   if (outfilename) {
     SaveFile(outfilename, out, outsize);
   } else {
-    size_t i;
-    for (i = 0; i < outsize; i++) {
-      /* Works only if terminal does not convert newlines. */
-      printf("%c", out[i]);
-    }
+#if _WIN32
+    /* Windows workaround for stdout output. */
+    _setmode(_fileno(stdout), _O_BINARY);
+#endif
+    fwrite(out, 1, outsize, stdout);
   }
 
   free(out);
@@ -143,14 +159,14 @@ int main(int argc, char* argv[]) {
     }
     else if (StringsEqual(arg, "--zlib")) output_type = ZOPFLI_FORMAT_ZLIB;
     else if (StringsEqual(arg, "--gzip")) output_type = ZOPFLI_FORMAT_GZIP;
-    else if (StringsEqual(arg, "--splitlast")) options.blocksplittinglast = 1;
+    else if (StringsEqual(arg, "--splitlast"))  /* Ignore */;
     else if (arg[0] == '-' && arg[1] == '-' && arg[2] == 'i'
         && arg[3] >= '0' && arg[3] <= '9') {
       options.numiterations = atoi(arg + 3);
     }
     else if (StringsEqual(arg, "-h")) {
       fprintf(stderr,
-          "Usage: zopfli [OPTION]... FILE\n"
+          "Usage: zopfli [OPTION]... FILE...\n"
           "  -h    gives this help\n"
           "  -c    write the result on standard output, instead of disk"
           " filename + '.gz'\n"
@@ -162,13 +178,13 @@ int main(int argc, char* argv[]) {
           "  --gzip        output to gzip format (default)\n"
           "  --zlib        output to zlib format instead of gzip\n"
           "  --deflate     output to deflate format instead of gzip\n"
-          "  --splitlast   do block splitting last instead of first\n");
+          "  --splitlast   ignored, left for backwards compatibility\n");
       return 0;
     }
   }
 
   if (options.numiterations < 1) {
-    fprintf(stderr, "Error: must have 1 or more iterations");
+    fprintf(stderr, "Error: must have 1 or more iterations\n");
     return 0;
   }
 

data/vendor/zopfli/{zopfli_lib.c → src/zopfli/zopfli_lib.c}

@@ -27,8 +27,7 @@ Author: jyrki.alakuijala@gmail.com (Jyrki Alakuijala)
 
 void ZopfliCompress(const ZopfliOptions* options, ZopfliFormat output_type,
                     const unsigned char* in, size_t insize,
-                    unsigned char** out, size_t* outsize)
-{
+                    unsigned char** out, size_t* outsize) {
   if (output_type == ZOPFLI_FORMAT_GZIP) {
     ZopfliGzipCompress(options, in, insize, out, outsize);
   } else if (output_type == ZOPFLI_FORMAT_ZLIB) {

data/zopfli.gemspec

@@ -13,37 +13,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/miyucy/zopfli"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.test_files    = `git ls-files -z -- spec`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files        -= spec.test_files
+  spec.files        -= ['vendor/zopfli']
+  spec.files        += Dir['vendor/zopfli/src/zopfli/**/*']
+  spec.files        += ['vendor/zopfli/COPYING']
+
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-
-  # get an array of submodule dirs by executing 'pwd' inside each submodule
-  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
-    # for each submodule, change working directory to that submodule
-    Dir.chdir(submodule_path) do
-
-      # issue git ls-files in submodule's directory
-      submodule_files = `git ls-files`.split($\)
-
-      # prepend the submodule path to create absolute file paths
-      submodule_files_fullpaths = submodule_files.map do |filename|
-        "#{submodule_path}/#{filename}"
-      end
-
-      # remove leading path parts to get paths relative to the gem's root dir
-      # (this assumes, that the gemspec resides in the gem's root dir)
-      submodule_files_paths = submodule_files_fullpaths.map do |filename|
-        filename.gsub "#{File.dirname(__FILE__)}/", ""
-      end
-
-      # add relative paths to gem.files
-      spec.files += submodule_files_paths
-    end
-  end
+  spec.add_development_dependency "rspec"
 end