zopfli 0.0.3 → 0.0.4

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

@@ -1,5 +1,5 @@
 /*
-LodePNG version 20130415
+LodePNG version 20131222
 
 Copyright (c) 2005-2013 Lode Vandevenne
 
@@ -262,7 +262,7 @@ struct LodePNGDecompressSettings
                              const unsigned char*, size_t,
                              const LodePNGDecompressSettings*);
 
-  void* custom_context; /*optional custom settings for custom functions*/
+  const void* custom_context; /*optional custom settings for custom functions*/
 };
 
 extern const LodePNGDecompressSettings lodepng_default_decompress_settings;
@@ -280,7 +280,7 @@ struct LodePNGCompressSettings /*deflate = compress*/
   /*LZ77 related settings*/
   unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/
   unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/
-  unsigned windowsize; /*the maximum is 32768, higher gives more compression but is slower. Typical value: 2048.*/
+  unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Typical value: 2048.*/
   unsigned minmatch; /*mininum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/
   unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/
   unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/
@@ -296,7 +296,7 @@ struct LodePNGCompressSettings /*deflate = compress*/
                              const unsigned char*, size_t,
                              const LodePNGCompressSettings*);
 
-  void* custom_context; /*optional custom settings for custom functions*/
+  const void* custom_context; /*optional custom settings for custom functions*/
 };
 
 extern const LodePNGCompressSettings lodepng_default_compress_settings;
@@ -501,10 +501,9 @@ The fix_png value works as described in struct LodePNGDecoderSettings.
 Note: for 16-bit per channel colors, uses big endian format like PNG does.
 */
 unsigned lodepng_convert(unsigned char* out, const unsigned char* in,
-                         LodePNGColorMode* mode_out, LodePNGColorMode* mode_in,
+                         LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in,
                          unsigned w, unsigned h, unsigned fix_png);
 
-
 #ifdef LODEPNG_COMPILE_DECODER
 /*
 Settings for the decoder. This contains settings for the PNG and the Zlib
@@ -524,7 +523,7 @@ typedef struct LodePNGDecoderSettings
   interpret it as opaque black.
   By default this value is 0, which makes it stop with an error on such images.
   */
-  unsigned fix_png; /*if 1, try to parse some broken PNG images, e.g. with out of bound palette.*/
+  unsigned fix_png;
   unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/
 
 #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
@@ -580,6 +579,17 @@ typedef enum LodePNGAutoConvert
 } LodePNGAutoConvert;
 
 
+/*
+Automatically chooses color type that gives smallest amount of bits in the
+output image, e.g. grey if there are only greyscale pixels, palette if there
+are less than 256 colors, ...
+The auto_convert parameter allows limiting it to not use palette, ...
+*/
+unsigned lodepng_auto_choose_color(LodePNGColorMode* mode_out,
+                                   const unsigned char* image, unsigned w, unsigned h,
+                                   const LodePNGColorMode* mode_in,
+                                   LodePNGAutoConvert auto_convert);
+
 /*Settings for the encoder.*/
 typedef struct LodePNGEncoderSettings
 {
@@ -599,7 +609,7 @@ typedef struct LodePNGEncoderSettings
   the same length as the amount of scanlines in the image, and each value must <= 5. You
   have to cleanup this buffer, LodePNG will never free it. Don't forget that filter_palette_zero
   must be set to 0 to ensure this is also used on palette or low bitdepth images.*/
-  unsigned char* predefined_filters;
+  const unsigned char* predefined_filters;
 
   /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested palette).
   If colortype is 3, PLTE is _always_ created.*/
@@ -1564,6 +1574,7 @@ yyyymmdd.
 Some changes aren't backwards compatible. Those are indicated with a (!)
 symbol.
 
+*) 22 dec 2013: Power of two windowsize required for optimization.
 *) 15 apr 2013: Fixed bug with LAC_ALPHA and color key.
 *) 25 mar 2013: Added an optional feature to ignore some PNG errors (fix_png).
 *) 11 mar 2013 (!): Bugfix with custom free. Changed from "my" to "lodepng_"

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

@@ -20,6 +20,7 @@
 #include "zopflipng_lib.h"
 
 #include <stdio.h>
+#include <set>
 #include <vector>
 
 #include "lodepng/lodepng.h"
@@ -78,8 +79,29 @@ unsigned CustomPNGDeflate(unsigned char** out, size_t* outsize,
   return 0;  // OK
 }
 
+// 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];
+}
+
+// Counts amount of colors in the image, up to 257. If transparent_counts_as_one
+// is enabled, any color with alpha channel 0 is treated as a single color with
+// index 0.
+void CountColors(std::set<unsigned>* unique,
+                 const unsigned char* image, unsigned w, unsigned h,
+                 bool transparent_counts_as_one) {
+  unique->clear();
+  for (size_t i = 0; i < w * h; i++) {
+    unsigned index = ColorIndex(&image[i * 4]);
+    if (transparent_counts_as_one && image[i * 4 + 3] == 0) index = 0;
+    unique->insert(index);
+    if (unique->size() > 256) break;
+  }
+}
+
 // Remove RGB information from pixels with alpha=0
-void LossyOptimizeTransparent(unsigned char* image, unsigned w, unsigned h) {
+void LossyOptimizeTransparent(lodepng::State* inputstate, unsigned char* image,
+    unsigned w, unsigned h) {
   // First check if we want to preserve potential color-key background color,
   // or instead use the last encountered RGB value all the time to save bytes.
   bool key = true;
@@ -89,13 +111,20 @@ void LossyOptimizeTransparent(unsigned char* image, unsigned w, unsigned h) {
       break;
     }
   }
+  std::set<unsigned> count;  // Color count, up to 257.
+  CountColors(&count, image, w, h, true);
+  // If true, means palette is possible so avoid using different RGB values for
+  // the transparent color.
+  bool palette = count.size() <= 256;
 
-  // Choose the color key if color keying is used.
+  // Choose the color key or first initial background color.
   int r = 0, g = 0, b = 0;
-  if (key) {
+  if (key || palette) {
     for (size_t i = 0; i < w * h; i++) {
       if (image[i * 4 + 3] == 0) {
-        // Use first encountered transparent pixel as the color key
+        // Use RGB value of first encountered transparent pixel. This can be
+        // used as a valid color key, or in case of palette ensures a color
+        // existing in the input image palette is used.
         r = image[i * 4 + 0];
         g = image[i * 4 + 1];
         b = image[i * 4 + 2];
@@ -104,20 +133,42 @@ void LossyOptimizeTransparent(unsigned char* image, unsigned w, unsigned h) {
   }
 
   for (size_t i = 0; i < w * h; i++) {
-    // if alpha is 0
+    // if alpha is 0, alter the RGB value to a possibly more efficient one.
     if (image[i * 4 + 3] == 0) {
       image[i * 4 + 0] = r;
       image[i * 4 + 1] = g;
       image[i * 4 + 2] = b;
     } else {
-      if (!key) {
-        // Use the last encountered RGB value if no color keying is used.
+      if (!key && !palette) {
+        // Use the last encountered RGB value if no key or palette is used: that
+        // way more values can be 0 thanks to the PNG filter types.
         r = image[i * 4 + 0];
         g = image[i * 4 + 1];
         b = image[i * 4 + 2];
       }
     }
   }
+
+  // If there are now less colors, update palette of input image to match this.
+  if (palette && inputstate->info_png.color.palettesize > 0) {
+    CountColors(&count, image, w, h, false);
+    if (count.size() < inputstate->info_png.color.palettesize) {
+      std::vector<unsigned char> palette_out;
+      unsigned char* palette_in = inputstate->info_png.color.palette;
+      for (size_t i = 0; i < inputstate->info_png.color.palettesize; i++) {
+        if (count.count(ColorIndex(&palette_in[i * 4])) != 0) {
+          palette_out.push_back(palette_in[i * 4 + 0]);
+          palette_out.push_back(palette_in[i * 4 + 1]);
+          palette_out.push_back(palette_in[i * 4 + 2]);
+          palette_out.push_back(palette_in[i * 4 + 3]);
+        }
+      }
+      inputstate->info_png.color.palettesize = palette_out.size() / 4;
+      for (size_t i = 0; i < palette_out.size(); i++) {
+        palette_in[i] = palette_out[i];
+      }
+    }
+  }
 }
 
 // Tries to optimize given a single PNG filter strategy.
@@ -134,9 +185,8 @@ unsigned TryOptimize(
   lodepng::State state;
   state.encoder.zlibsettings.windowsize = windowsize;
   if (use_zopfli && png_options->use_zopfli) {
-    ZopfliPNGOptions custom_context = *png_options;
     state.encoder.zlibsettings.custom_deflate = CustomPNGDeflate;
-    state.encoder.zlibsettings.custom_context = &custom_context;
+    state.encoder.zlibsettings.custom_context = png_options;
   }
 
   if (inputstate.info_png.color.colortype == LCT_PALETTE) {
@@ -214,7 +264,7 @@ unsigned TryOptimize(
   }
 
   if (error) {
-    printf("Encoding error %i: %s\n", error, lodepng_error_text(error));
+    printf("Encoding error %u: %s\n", error, lodepng_error_text(error));
     return error;
   }
 
@@ -308,7 +358,6 @@ int ZopfliPNGOptimize(const std::vector<unsigned char>& origpng,
     strategy_enable[png_options.filter_strategies[i]] = true;
   }
 
-
   std::vector<unsigned char> image;
   unsigned w, h;
   unsigned error;
@@ -333,7 +382,7 @@ int ZopfliPNGOptimize(const std::vector<unsigned char>& origpng,
   if (!error) {
     // If lossy_transparent, remove RGB information from pixels with alpha=0
     if (png_options.lossy_transparent && !bit16) {
-      LossyOptimizeTransparent(&image[0], w, h);
+      LossyOptimizeTransparent(&inputstate, &image[0], w, h);
     }
 
     if (png_options.auto_filter_strategy) {

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

@@ -19,8 +19,8 @@
 // backend, chooses optimal PNG color model, and tries out several PNG filter
 // strategies.
 
-#ifndef UTIL_COMPRESSION_ZOPFLI_PNG_ZOPFLIPNG_LIB_H_
-#define UTIL_COMPRESSION_ZOPFLI_PNG_ZOPFLIPNG_LIB_H_
+#ifndef ZOPFLIPNG_LIB_H_
+#define ZOPFLIPNG_LIB_H_
 
 #include <string>
 #include <vector>
@@ -76,4 +76,4 @@ int ZopfliPNGOptimize(const std::vector<unsigned char>& origpng,
     bool verbose,
     std::vector<unsigned char>* resultpng);
 
-#endif  // UTIL_COMPRESSION_ZOPFLI_PNG_ZOPFLIPNG_LIB_H_
+#endif  // ZOPFLIPNG_LIB_H_

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: zopfli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: zopfli
@@ -60,8 +60,8 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
+- ".gitignore"
+- ".gitmodules"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,12 +71,11 @@ files:
 - lib/zopfli/version.rb
 - test/fixtures/alice29.txt
 - test/test_zopfli_deflate.rb
-- zopfli.gemspec
 - vendor/zopfli/CONTRIBUTORS
 - vendor/zopfli/COPYING
+- vendor/zopfli/Makefile
 - vendor/zopfli/README
 - vendor/zopfli/README.zopflipng
-- vendor/zopfli/makefile
 - vendor/zopfli/src/zopfli/blocksplitter.c
 - vendor/zopfli/src/zopfli/blocksplitter.h
 - vendor/zopfli/src/zopfli/cache.c
@@ -109,6 +108,7 @@ files:
 - vendor/zopfli/src/zopflipng/zopflipng_bin.cc
 - vendor/zopfli/src/zopflipng/zopflipng_lib.cc
 - vendor/zopfli/src/zopflipng/zopflipng_lib.h
+- zopfli.gemspec
 homepage: http://github.com/miyucy/zopfli
 licenses:
 - MIT
@@ -119,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: zopfli