webp-ffi 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c6477ba5c12959272c5f876298ebf8fe7ca91da5
-  data.tar.gz: b6cdddd80a1de784a3e649143e98d8a08d70303b
+SHA256:
+  metadata.gz: 976dae5457f3f3f651095f92ac882a9dc9f8dbe5bb52a99cf07d834c2ef020b3
+  data.tar.gz: 914c57979aa313a2f999b9031cecd60439fa6a73d4e4e81c0b8c61263c3d1539
 SHA512:
-  metadata.gz: e656666a00108b7b524b366a43803228c6c99a8d8995b7d2ed69eaa20e3a3c128123d9d0c917208b64ed632a2f9ffe7f92cd4ab32105afda352b51e67a7ca5eb
-  data.tar.gz: c70b6c901fa02e7ad934394d9bc250b01ac357cf5f60822db083da38ccb496890d2ce6381824c2d3193a0da57579649b798bbe997f0dea72366697b1bf7b0999
+  metadata.gz: 3bfeb83ba2b884165cabba2dba3409eb6ea1c6f9def8190f2a5f3ac86c2393b91faa432ae1258b36410a02921b2a1273d5bd4e50c04ca5b0e4e6c19f6a5b9e8a
+  data.tar.gz: fd9fc4f3ded81c06a54c9c606fa63c6d51ef7c1943be9a59ade65124d5589ed4216e20d823a74fcc80a65be09c61a9f99955b2cbd3817a5e7d52d732df1e7879

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.5.3

data/.travis.yml

@@ -8,9 +8,13 @@ before_install:
 
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.3
+  - 2.4.1
+  - 2.5.3
+  - 2.6.1
   - jruby-19mode
   - rbx-19mode
   - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.2.6
+
+* Tested on webp 1.0.2
+* Added near_lossless option
+
+## v0.2.5
+
+* Fix build for Travis CI docker containers
+
 ## v0.2.4
 
 * DRY C code and split into files each read/write formats

data/README.md

@@ -19,6 +19,10 @@ For Ubuntu, Debian:
 
     sudo apt-get install libjpeg-dev libpng-dev libtiff-dev libwebp-dev
 
+For Fedora, CentOS:
+
+    sudo dnf install libjpeg-devel libpng-devel libtiff-devel libwebp-devel
+
 For Mac OS:
 
     brew install libjpg libpng libtiff webp
@@ -85,6 +89,7 @@ Encode png, jpg or tiff image to webp with options:
 Possible encode options:
 
  * **lossless** (int) - Lossless encoding (0=lossy(default), 1=lossless)
+ * **near_lossless** (int) - Use near-lossless image preprocessing (0=maximum preprocessing, 100=no preprocessing(default))
  * **quality** (float) - between 0 (smallest file) and 100 (biggest)
  * **method** (int) - quality/speed trade-off (0=fast, 6=slower-better)
  * **target\_size** (int) - if non-zero, set the desired target size in bytes. Takes precedence over the 'compression' parameter
@@ -142,6 +147,47 @@ Possible decode options:
  * **crop\_x** (int), **crop\_y** (int), **crop\_w** (int), **crop\_h** (int) - crop picture with the given rectangle
  * **resize\_w** (int), **resize\_h** (int) - resize picture (after any cropping)
 
+## Rails assets pipeline integration
+
+For integration with Rails 3+ you can use very simple rake task:
+
+```ruby
+# Place this code in lib/tasks/assets.rake
+require 'webp-ffi'
+
+namespace :assets do
+  desc "Create .webp versions of assets"
+  task :webp => :environment do
+    image_types = /\.(?:png|jpe?g)$/
+
+    public_assets = File.join(
+      Rails.root,
+      "public",
+      Rails.application.config.assets.prefix)
+
+    Dir["#{public_assets}/**/*"].each do |filename|
+      next unless filename =~ image_types
+
+      mtime = File.mtime(filename)
+      webp_file = "#{filename}.webp"
+      next if File.exist?(webp_file) && File.mtime(webp_file) >= mtime
+      begin
+        WebP.encode(filename, webp_file)
+        File.utime(mtime, mtime, webp_file)
+        puts "Webp converted image #{webp_file}"
+      rescue => e
+        puts "Webp convertion error of image #{webp_file}. Error info: #{e.message}"
+      end
+    end
+  end
+
+  # Hook into existing assets:precompile task
+  Rake::Task["assets:precompile"].enhance do
+    Rake::Task["assets:webp"].invoke
+  end
+end
+```
+
 ## Contributing
 
 1. Fork it

data/ext/webp_ffi/webp_ffi.c

@@ -64,6 +64,10 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   if (encode_config->lossless == 0 || encode_config->lossless == 1){
     config.lossless = encode_config->lossless;
   }
+  if (encode_config->near_lossless >= 0 && encode_config->near_lossless <= 100){
+    config.near_lossless = encode_config->near_lossless;
+    config.lossless = 1;  // use near-lossless only with lossless
+  }
   if (encode_config->quality >= 0 && encode_config->quality <= 100){
     config.quality = encode_config->quality;
   }
@@ -288,4 +292,4 @@ int test_c(int n) {
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }    // extern "C"
-#endif
+#endif

data/ext/webp_ffi/webp_ffi.h

@@ -7,6 +7,7 @@ extern "C" {
 
   typedef struct {
     int lossless;           // Lossless encoding (0=lossy(default), 1=lossless).
+    int near_lossless;      // use near-lossless image preprocessing (0..100=off)
     float quality;          // between 0 (smallest file) and 100 (biggest)
     int method;             // quality/speed trade-off (0=fast, 6=slower-better)
 
@@ -42,7 +43,7 @@ extern "C" {
     int crop_x, crop_y, crop_w, crop_h;
     int resize_w, resize_h;
   } FfiWebpEncodeConfig;
-  
+
   typedef struct {
     OutputFileFormat output_format;
     int bypass_filtering;               // if true, skip the in-loop filtering
@@ -51,7 +52,7 @@ extern "C" {
     int resize_w, resize_h;
     int use_threads;                    // if true, use multi-threaded decoding
   } FfiWebpDecodeConfig;
-  
+
 
   void decoder_version(char *version);
   void encoder_version(char *version);
@@ -64,4 +65,4 @@ extern "C" {
 }    // extern "C"
 #endif
 
-#endif	/* _WEBP_FFI_H_ */
+#endif	/* _WEBP_FFI_H_ */

data/lib/webp/c.rb

@@ -12,6 +12,7 @@ module WebP
     # struct
     class FfiWebpEncodeConfig < FFI::Struct
       layout  :lossless, :int,
+        :near_lossless, :int,
         :quality, :float,
         :method, :int,
         :target_size, :int,

data/lib/webp/options.rb

@@ -8,7 +8,7 @@ module WebP
     def encode_pointer
       options_pointer = FFI::MemoryPointer.new :char, C::FfiWebpEncodeConfig.size, false
       options_struct = C::FfiWebpEncodeConfig.new options_pointer
-      [:lossless, :method, :target_size, :target_PSNR, :segments,
+      [:lossless, :near_lossless, :method, :target_size, :target_PSNR, :segments,
         :sns_strength, :filter_strength, :filter_sharpness,
         :filter_type, :autofilter, :alpha_compression, :alpha_filtering,
         :alpha_quality, :pass, :show_compressed, :preprocessing, :partitions,

data/lib/webp/version.rb

@@ -1,3 +1,3 @@
 module WebP
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/travis_build.sh

@@ -1,6 +1,6 @@
 #/usr/bin/env sh
-wget http://downloads.webmproject.org/releases/webp/libwebp-0.4.2.tar.gz
-tar xvzf libwebp-0.4.2.tar.gz
-cd libwebp-0.4.2
+wget http://downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+tar xvzf libwebp-1.0.2.tar.gz
+cd libwebp-1.0.2
 ./configure --prefix=$HOME/opt
 make && make install

data/spec/webp_ffi_spec.rb

@@ -81,6 +81,12 @@ describe WebP do
         out_filename = File.expand_path(File.join(@out_dir, "#{image}.png.webp"))
         expect(WebP.encode(in_filename, out_filename)).to be_truthy
       end
+
+      it "#{image}.png image with near_lossless" do
+        in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.png"))
+        out_filename = File.expand_path(File.join(@out_dir, "#{image}_near_lossless.png.webp"))
+        expect(WebP.encode(in_filename, out_filename, near_lossless: 60)).to be_truthy
+      end
     end
     factories[:jpg].each do |image|
       it "#{image}.jpg image" do
@@ -88,6 +94,12 @@ describe WebP do
         out_filename = File.expand_path(File.join(@out_dir, "#{image}.jpg.webp"))
         expect(WebP.encode(in_filename, out_filename)).to be_truthy
       end
+
+      it "#{image}.jpg image with near_lossless" do
+        in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.jpg"))
+        out_filename = File.expand_path(File.join(@out_dir, "#{image}_near_lossless.jpg.webp"))
+        expect(WebP.encode(in_filename, out_filename, near_lossless: 60)).to be_truthy
+      end
     end
     factories[:tiff].each do |image|
       it "#{image}.tif image" do
@@ -176,4 +188,4 @@ describe WebP do
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Alexey Vasyliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for libwebp