zopfli 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503ace95ca436e62f8e7d158bce6dd89e70306cb
-  data.tar.gz: c7ff625d49d161b4a5e72982d3f411b3d06a9e7a
+  metadata.gz: 4ed0d8eec767ad3ac6d89fef3b9acb09e2cc1091
+  data.tar.gz: 9c9c5a832bcebf030c9e7950cf4c1165dd74f7e3
 SHA512:
-  metadata.gz: 9a547aa524567c257e28b7135eff8592b2a051b79b26156afb47f0417761bc414518b19040358c2b3aa194803ca841de41216c7ac4d155a1cc0315978f75fcbe
-  data.tar.gz: 2ad09ff1f2cfbc06f517ef06f217d68508ed40407847651c4ece8986b030298a67b428cb1034c10bd03df33767fe386c70a8f25c523b9731ff735a4f14beced4
+  metadata.gz: d7f5decb3aec6b12d4a868071fc92cc4156d80253eaed923296b7d14aa302398cccbc155c27b94c76f2af394d2c5949cedca2f856a99d1fb6c06e58db4567022
+  data.tar.gz: 980e462293ea31247405e54a9614d9948570bfb4936bd2179160b19d2b156879cc0a2dba5153c0b3151afbc12e949a375e558b8efe0e38a4a5484fe166d6b4d6

data/README.md

@@ -1,6 +1,6 @@
 # Zopfli
 
-see https://code.google.com/p/zopfli/
+see https://github.com/google/zopfli
 
 ## Installation
 
@@ -30,6 +30,11 @@ compressed_data = Zopfli.deflate string
 uncompressed_data = Zlib::Inflate.inflate compressed_data
 uncompressed_data == string
 # => true
+
+Zlib.deflate(File.read('LICENSE.txt'), Zlib::BEST_COMPRESSION).bytesize
+# => 628
+Zopfli.deflate(File.read('LICENSE.txt')).bytesize
+# => 601
 ```
 
 ## Contributing

data/lib/zopfli/version.rb

@@ -1,3 +1,3 @@
 module Zopfli
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/test_zopfli_deflate.rb

@@ -24,12 +24,9 @@ describe Zopfli do
   it "gzip format works" do
     fixture = fixtures("alice29.txt").read
 
-    gzipped = Zopfli.deflate fixture, format: :gzip
+    deflated = Zopfli.deflate fixture, format: :gzip
 
-    uncompressed = nil
-    Zlib::GzipReader.wrap(StringIO.new gzipped) { |gz|
-      uncompressed = gz.read
-    }
+    uncompressed = Zlib::GzipReader.wrap(StringIO.new(deflated), &:read)
 
     uncompressed.must_equal fixture
   end
@@ -37,11 +34,12 @@ describe Zopfli do
   it "deflate format works" do
     fixture = fixtures("alice29.txt").read
 
-    deflate = Zopfli.deflate fixture, format: :deflate
+    Zopfli.deflate fixture, format: :deflate
+
     skip "How to test"
   end
 
   def fixtures(name)
-    File.open(File.join File.dirname(__FILE__), "fixtures", name)
+    File.open(File.join(File.dirname(__FILE__), "fixtures", name))
   end
 end

data/vendor/zopfli/CONTRIBUTING.md

@@ -0,0 +1,24 @@
+Want to contribute? Great! First, read this page (including the small print at the end).
+
+### Before you contribute
+Before we can use your code, you must sign the
+[Google Individual Contributor License Agreement](https://developers.google.com/open-source/cla/individual?csw=1)
+(CLA), which you can do online. The CLA is necessary mainly because you own the
+copyright to your changes, even after your contribution becomes part of our
+codebase, so we need your permission to use and distribute your code. We also
+need to be sure of various other things—for instance that you'll tell us if you
+know that your code infringes on other people's patents. You don't have to sign
+the CLA until after you've submitted your code for review and a member has
+approved it, but you must do it before we can put your code into our codebase.
+Before you start working on a larger contribution, you should get in touch with
+us first through the issue tracker with your idea so that we can help out and
+possibly guide you. Coordinating up front makes it much easier to avoid
+frustration later on.
+
+### Code reviews
+All submissions, including submissions by project members, require review. We
+use Github pull requests for this purpose.
+
+### The small print
+Contributions made by corporations are covered by a different agreement than
+the one above, the Software Grant and Corporate Contributor License Agreement.

data/vendor/zopfli/CONTRIBUTORS

@@ -5,3 +5,4 @@ Daniel Reed
 Huzaifa Sidhpurwala
 Péter Szabó
 Lode Vandevenne
+Derek Buitenhuis

data/vendor/zopfli/Makefile

@@ -32,6 +32,11 @@ zopflipng:
 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
 	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
 
+# ZopfliPNG shared library
+libzopflipng:
+	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
+
 # Remove all libraries and binaries
 clean:
 	rm -f zopflipng zopfli $(ZOPFLILIB_OBJ) libzopfli*

data/vendor/zopfli/src/zopfli/cache.c

@@ -31,6 +31,10 @@ void ZopfliInitCache(size_t blocksize, ZopfliLongestMatchCache* lmc) {
   lmc->dist = (unsigned short*)malloc(sizeof(unsigned short) * blocksize);
   /* Rather large amount of memory. */
   lmc->sublen = (unsigned char*)malloc(ZOPFLI_CACHE_LENGTH * 3 * blocksize);
+  if(lmc->sublen == NULL) {
+    fprintf(stderr,"Error: Out of memory. Tried allocating %lu bytes of memory.\n",(unsigned long)(ZOPFLI_CACHE_LENGTH * 3 * blocksize));
+    exit (EXIT_FAILURE);
+  }
 
   /* length > 0 and dist 0 is invalid combination, which indicates on purpose
   that this cache value is not filled in yet. */

data/vendor/zopfli/src/zopfli/deflate.c

@@ -536,7 +536,7 @@ static void AddLZ77Block(const ZopfliOptions* options, int btype, int final,
   unsigned d_lengths[32];
   unsigned ll_symbols[288];
   unsigned d_symbols[32];
-  size_t detect_block_size = *outsize;
+  size_t detect_block_size;
   size_t compressed_size;
   size_t uncompressed_size = 0;
   size_t i;
@@ -844,6 +844,7 @@ void ZopfliDeflatePart(const ZopfliOptions* options, int btype, int final,
 void ZopfliDeflate(const ZopfliOptions* options, int btype, int final,
                    const unsigned char* in, size_t insize,
                    unsigned char* bp, unsigned char** out, size_t* outsize) {
+ size_t offset = *outsize;
 #if ZOPFLI_MASTER_BLOCK_SIZE == 0
   ZopfliDeflatePart(options, btype, final, in, 0, insize, bp, out, outsize);
 #else
@@ -860,7 +861,7 @@ void ZopfliDeflate(const ZopfliOptions* options, int btype, int final,
   if (options->verbose) {
     fprintf(stderr,
             "Original Size: %d, Deflate: %d, Compression: %f%% Removed\n",
-            (int)insize, (int)*outsize,
-            100.0 * (double)(insize - *outsize) / (double)insize);
+            (int)insize, (int)(*outsize - offset),
+            100.0 * (double)(insize - (*outsize - offset)) / (double)insize);
   }
 }

data/vendor/zopfli/src/zopfli/hash.h

@@ -27,16 +27,16 @@ The hash for ZopfliFindLongestMatch of lz77.c.
 #include "util.h"
 
 typedef struct ZopfliHash {
-  int* head;  /* Hash value to index of its most recent occurance. */
-  unsigned short* prev;  /* Index to index of prev. occurance of same hash. */
+  int* head;  /* Hash value to index of its most recent occurrence. */
+  unsigned short* prev;  /* Index to index of prev. occurrence of same hash. */
   int* hashval;  /* Index to hash value at this index. */
   int val;  /* Current hash value. */
 
 #ifdef ZOPFLI_HASH_SAME_HASH
   /* Fields with similar purpose as the above hash, but for the second hash with
   a value that is calculated differently.  */
-  int* head2;  /* Hash value to index of its most recent occurance. */
-  unsigned short* prev2;  /* Index to index of prev. occurance of same hash. */
+  int* head2;  /* Hash value to index of its most recent occurrence. */
+  unsigned short* prev2;  /* Index to index of prev. occurrence of same hash. */
   int* hashval2;  /* Index to hash value at this index. */
   int val2;  /* Current hash value. */
 #endif

data/vendor/zopfli/src/zopfli/katajainen.h

@@ -30,7 +30,7 @@ The output is tailored for DEFLATE: symbols that never occur, get a bit length
 of 0, and if only a single symbol occurs at least once, its bitlength will be 1,
 and not 0 as would theoretically be needed for a single symbol.
 
-frequencies: The amount of occurances of each symbol.
+frequencies: The amount of occurrences of each symbol.
 n: The amount of symbols.
 maxbits: Maximum bit length, inclusive.
 bitlengths: Output, the bitlengths for the symbol prefix codes.

data/vendor/zopfli/src/zopfli/zopfli_bin.c

@@ -33,6 +33,11 @@ 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.
 */
@@ -47,6 +52,10 @@ static void LoadFile(const char* filename,
 
   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);
@@ -71,6 +80,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);
@@ -99,8 +112,11 @@ static void CompressFile(const ZopfliOptions* options,
     SaveFile(outfilename, out, outsize);
   } else {
     size_t i;
+#if _WIN32
+    /* Windows workaround for stdout output. */
+    _setmode(_fileno(stdout), _O_BINARY);
+#endif
     for (i = 0; i < outsize; i++) {
-      /* Works only if terminal does not convert newlines. */
       printf("%c", out[i]);
     }
   }
@@ -150,7 +166,7 @@ int main(int argc, char* argv[]) {
     }
     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"
@@ -168,7 +184,7 @@ int main(int argc, char* argv[]) {
   }
 
   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/src/zopflipng/lodepng/lodepng.cpp

@@ -5165,16 +5165,8 @@ static void filterScanline(unsigned char* out, const unsigned char* scanline, co
       for(i = 0; i < length; i++) out[i] = scanline[i];
       break;
     case 1: /*Sub*/
-      if(prevline)
-      {
-        for(i = 0; i < bytewidth; i++) out[i] = scanline[i];
-        for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth];
-      }
-      else
-      {
-        for(i = 0; i < bytewidth; i++) out[i] = scanline[i];
-        for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth];
-      }
+      for(i = 0; i < bytewidth; i++) out[i] = scanline[i];
+      for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth];
       break;
     case 2: /*Up*/
       if(prevline)

data/vendor/zopfli/src/zopflipng/zopflipng_bin.cc

@@ -151,7 +151,6 @@ int main(int argc, char *argv[]) {
   std::string prefix = "zopfli_";  // prefix for output filenames
 
   std::vector<std::string> files;
-  std::vector<char> options;
   for (int i = 1; i < argc; i++) {
     std::string arg = argv[i];
     if (arg[0] == '-' && arg.size() > 1 && arg[1] != '-') {
@@ -182,6 +181,8 @@ int main(int argc, char *argv[]) {
       int num = atoi(value.c_str());
       if (name == "--always_zopflify") {
         always_zopflify = true;
+      } else if (name == "--verbose") {
+        png_options.verbose = true;
       } else if (name == "--lossy_transparent") {
         png_options.lossy_transparent = true;
       } else if (name == "--lossy_8bit") {
@@ -291,7 +292,7 @@ int main(int argc, char *argv[]) {
     error = ZopfliPNGOptimize(origpng, png_options, true, &resultpng);
 
     if (error) {
-      printf("Decoding error %i: %s\n", error, lodepng_error_text(error));
+      printf("Decoding error %u: %s\n", error, lodepng_error_text(error));
     }
 
     // Verify result, check that the result causes no decoding errors

data/vendor/zopfli/src/zopflipng/zopflipng_lib.cc

@@ -19,7 +19,10 @@
 
 #include "zopflipng_lib.h"
 
+#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <set>
 #include <vector>
 
@@ -29,6 +32,7 @@
 
 ZopfliPNGOptions::ZopfliPNGOptions()
   : lossy_transparent(false)
+  , verbose(false)
   , lossy_8bit(false)
   , auto_filter_strategy(true)
   , use_zopfli(true)
@@ -48,6 +52,7 @@ unsigned CustomPNGDeflate(unsigned char** out, size_t* outsize,
   ZopfliOptions options;
   ZopfliInitOptions(&options);
 
+  options.verbose = png_options->verbose;
   options.numiterations = insize < 200000
       ? png_options->num_iterations : png_options->num_iterations_large;
 
@@ -81,7 +86,7 @@ unsigned CustomPNGDeflate(unsigned char** out, size_t* outsize,
 
 // Returns 32-bit integer value for RGBA color.
 static unsigned ColorIndex(const unsigned char* color) {
-  return color[0] + 256u * color[1] + 65536u * color[1] + 16777216u * color[3];
+  return color[0] + 256u * color[1] + 65536u * color[2] + 16777216u * color[3];
 }
 
 // Counts amount of colors in the image, up to 257. If transparent_counts_as_one
@@ -128,6 +133,7 @@ void LossyOptimizeTransparent(lodepng::State* inputstate, unsigned char* image,
         r = image[i * 4 + 0];
         g = image[i * 4 + 1];
         b = image[i * 4 + 2];
+        break;
       }
     }
   }
@@ -366,7 +372,7 @@ int ZopfliPNGOptimize(const std::vector<unsigned char>& origpng,
 
   if (error) {
     if (verbose) {
-      printf("Decoding error %i: %s\n", error, lodepng_error_text(error));
+      printf("Decoding error %u: %s\n", error, lodepng_error_text(error));
     }
     return error;
   }
@@ -423,3 +429,64 @@ int ZopfliPNGOptimize(const std::vector<unsigned char>& origpng,
 
   return error;
 }
+
+extern "C" void CZopfliPNGSetDefaults(CZopfliPNGOptions* png_options) {
+    
+  memset(png_options, 0, sizeof(*png_options));
+  // Constructor sets the defaults
+  ZopfliPNGOptions opts;
+
+  png_options->lossy_transparent    = opts.lossy_transparent;
+  png_options->lossy_8bit           = opts.lossy_8bit;
+  png_options->auto_filter_strategy = opts.auto_filter_strategy;
+  png_options->use_zopfli           = opts.use_zopfli;
+  png_options->num_iterations       = opts.num_iterations;
+  png_options->num_iterations_large = opts.num_iterations_large;
+  png_options->block_split_strategy = opts.block_split_strategy;
+}
+
+extern "C" int CZopfliPNGOptimize(const unsigned char* origpng,
+                                  const size_t origpng_size,
+                                  const CZopfliPNGOptions* png_options,
+                                  int verbose,
+                                  unsigned char** resultpng,
+                                  size_t* resultpng_size) {
+  ZopfliPNGOptions opts;
+
+  // Copy over to the C++-style struct
+  opts.lossy_transparent    = !!png_options->lossy_transparent;
+  opts.lossy_8bit           = !!png_options->lossy_8bit;
+  opts.auto_filter_strategy = !!png_options->auto_filter_strategy;
+  opts.use_zopfli           = !!png_options->use_zopfli;
+  opts.num_iterations       = png_options->num_iterations;
+  opts.num_iterations_large = png_options->num_iterations_large;
+  opts.block_split_strategy = png_options->block_split_strategy;
+
+  for (int i = 0; i < png_options->num_filter_strategies; i++) {
+    opts.filter_strategies.push_back(png_options->filter_strategies[i]);
+  }
+
+  for (int i = 0; i < png_options->num_keepchunks; i++) {
+    opts.keepchunks.push_back(png_options->keepchunks[i]);
+  }
+
+  const std::vector<unsigned char> origpng_cc(origpng, origpng + origpng_size);
+  std::vector<unsigned char> resultpng_cc;
+
+  int ret = ZopfliPNGOptimize(origpng_cc, opts, !!verbose, &resultpng_cc);
+  if (ret) {
+    return ret;
+  }
+
+  *resultpng_size = resultpng_cc.size();
+  *resultpng      = (unsigned char*) malloc(resultpng_cc.size());
+  if (!(*resultpng)) {
+    return ENOMEM;
+  }
+
+  memcpy(*resultpng,
+         reinterpret_cast<unsigned char*>(&resultpng_cc[0]),
+         resultpng_cc.size());
+
+  return 0;
+}

data/vendor/zopfli/src/zopflipng/zopflipng_lib.h

@@ -22,9 +22,17 @@
 #ifndef ZOPFLIPNG_LIB_H_
 #define ZOPFLIPNG_LIB_H_
 
+#ifdef __cplusplus
+
 #include <string>
 #include <vector>
 
+extern "C" {
+
+#endif
+
+#include <stdlib.h>
+
 enum ZopfliPNGFilterStrategy {
   kStrategyZero = 0,
   kStrategyOne = 1,
@@ -38,9 +46,54 @@ enum ZopfliPNGFilterStrategy {
   kNumFilterStrategies /* Not a strategy but used for the size of this enum */
 };
 
+typedef struct CZopfliPNGOptions {
+  int lossy_transparent;
+  int lossy_8bit;
+
+  enum ZopfliPNGFilterStrategy* filter_strategies;
+  // How many strategies to try.
+  int num_filter_strategies;
+
+  int auto_filter_strategy;
+
+  char** keepchunks;
+  // How many entries in keepchunks.
+  int num_keepchunks;
+
+  int use_zopfli;
+
+  int num_iterations;
+
+  int num_iterations_large;
+
+  int block_split_strategy;
+} CZopfliPNGOptions;
+
+// Sets the default options
+// Does not allocate or set keepchunks or filter_strategies
+void CZopfliPNGSetDefaults(CZopfliPNGOptions *png_options);
+
+// Returns 0 on success, error code otherwise
+// The caller must free resultpng after use
+int CZopfliPNGOptimize(const unsigned char* origpng,
+    const size_t origpng_size,
+    const CZopfliPNGOptions* png_options,
+    int verbose,
+    unsigned char** resultpng,
+    size_t* resultpng_size);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif 
+
+// C++ API
+#ifdef __cplusplus
+
 struct ZopfliPNGOptions {
   ZopfliPNGOptions();
 
+  bool verbose;
+
   // Allow altering hidden colors of fully transparent pixels
   bool lossy_transparent;
   // Convert 16-bit per channel images to 8-bit per channel
@@ -76,4 +129,6 @@ int ZopfliPNGOptimize(const std::vector<unsigned char>& origpng,
     bool verbose,
     std::vector<unsigned char>* resultpng);
 
+#endif  // __cplusplus
+
 #endif  // ZOPFLIPNG_LIB_H_

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zopfli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/zopfli/version.rb
 - test/fixtures/alice29.txt
 - test/test_zopfli_deflate.rb
+- vendor/zopfli/CONTRIBUTING.md
 - vendor/zopfli/CONTRIBUTORS
 - vendor/zopfli/COPYING
 - vendor/zopfli/Makefile
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: zopfli