webp-ffi 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34b1495b74a5385dd27950b6e4bc2f4e5391fa97
-  data.tar.gz: 90b299d673ff0c22afef51ffbb61d6fabd4733ae
+SHA256:
+  metadata.gz: 9dbe6d1f0ae67d2687cd1a8d9529c895a7459911b3fd2d4ad4d16b35505263e5
+  data.tar.gz: 1b933a2313048dcfa7d4e89cbe230d0fe18edae1d07f2f25672a82f53b4fb01b
 SHA512:
-  metadata.gz: fe4fd8a5a8b3fe9b741bc028c55f13272ff1e642961d88b9bc4bbcbf74b4554c0312617a0e13b3b106473846587d0d4cbee2a0ae0818347e0f471d91badee2f1
-  data.tar.gz: 7a7b54b518cee8bb959c6a074c4983991492ec1cce5192a8f915568d748f20ad7570581952dd5c1b09ce0e471d87104532ff42c6cb849413a05f6e6b0f89eba4
+  metadata.gz: d1548837a12b307bccd667ae8a10abcf711a84c60cea15be6a5b98f2580666c73de9195fd9b32b877d9ba9df377d4a75f8457d7015c8f77c1ba8f84e032861a0
+  data.tar.gz: 46bae931c7e2aa2e61adf94cdc252ae703fd0e7a0333f6a14b83cbbfb4b3dc689b65934ac28a58cd5fb2ffae0b1cfe9a5d3d5822b54b9525a981328eee306a34

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.7.1

data/.travis.yml

@@ -1,23 +1,38 @@
 language: ruby
+
 before_install:
   - ./spec/travis_build.sh > /dev/null 2>&1
+  - export LD_FLAGS=-L$HOME/opt/lib
+  - export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib:$HOME/opt/lib
+  - export CPATH=$CPATH:$HOME/opt/include
+
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - jruby-19mode
   - rbx-19mode
   - ruby-head
   - jruby-head
+env:
+  - LIBWEBP_VERSION=0.4.4
+  - LIBWEBP_VERSION=1.0.2
+
+cache: bundler
+sudo: false
+dist: xenial
+
 notifications:
   email: false
+
 branches:
   only:
     - master
     - development
+
 matrix:
   allow_failures:
     - rvm: rbx-19mode
     - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v0.2.7
+
+* Fix build for old libwebp versions
+
+## 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

@@ -1,7 +1,7 @@
 # Webp-ffi
 
-[![Build Status](https://travis-ci.org/le0pard/webp-ffi.png)](https://travis-ci.org/le0pard/webp-ffi)
-[![Code Climate](https://codeclimate.com/github/le0pard/webp-ffi.png)](https://codeclimate.com/github/le0pard/webp-ffi)
+[![Build Status](https://travis-ci.com/le0pard/webp-ffi.svg?branch=master)](https://travis-ci.com/le0pard/webp-ffi)
+[![Code Climate](https://codeclimate.com/github/le0pard/webp-ffi/badges/gpa.svg)](https://codeclimate.com/github/le0pard/webp-ffi)
 
 Ruby wrapper for libwebp. What is WebP?
 
@@ -17,7 +17,11 @@ First of all you should have install libraries: libpng, libjpeg and libtiff.
 
 For Ubuntu, Debian:
 
-    sudo apt-get install libjpeg-dev libpng-dev libtiff-dev
+    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:
 
@@ -27,7 +31,7 @@ or (for MacPorts):
 
     sudo port install jpeg libpng tiff
 
-Next, you should [install libwebp](https://developers.google.com/speed/webp/docs/compiling) (if you didn't install it by `brew` in Mac OS). This gem is not support Windows systems (sorry).
+Next, you should [install libwebp](https://developers.google.com/speed/webp/docs/compiling) (if you didn't install it by `brew` in Mac OS or by `apt-get` in Ubuntu or Debian). Webp library version should be >= 0.3.0. This gem is not support Windows systems.
 
 ### Final part
 
@@ -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/Rakefile

@@ -20,8 +20,8 @@ namespace "ffi-compiler" do
     c.have_library?('png')
     c.have_library?('jpeg')
     c.have_library?('tiff')
-    c.cflags << "-arch x86_64" if c.platform.mac?
-    c.ldflags << "-arch x86_64" if c.platform.mac?
+    c.ldflags << ENV['LD_FLAGS'] if ENV['LD_FLAGS']
+    c.cflags << ENV['C_FLAGS'] if ENV['C_FLAGS']
   end
 end
 task :compile => ["ffi-compiler:default"]
@@ -35,4 +35,4 @@ task :default => [:clean, :compile, :spec]
 
 CLEAN.include('ext/**/*{.o,.log,.so,.bundle}')
 CLEAN.include('lib/**/*{.o,.log,.so,.bundle}')
-CLEAN.include('ext/**/Makefile')
+CLEAN.include('ext/**/Makefile')

data/ext/webp_ffi/Rakefile

@@ -14,7 +14,6 @@ FFI::Compiler::CompileTask.new('webp_ffi') do |c|
   c.have_library?('png')
   c.have_library?('jpeg')
   c.have_library?('tiff')
-  # compiler flags
-  c.cflags << "-arch x86_64" if c.platform.mac?
-  c.ldflags << "-arch x86_64" if c.platform.mac?
+  c.ldflags << ENV['LD_FLAGS'] if ENV['LD_FLAGS']
+  c.cflags << ENV['C_FLAGS'] if ENV['C_FLAGS']
 end

data/ext/webp_ffi/webp_ffi.c

@@ -64,6 +64,14 @@ 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 (ENC_MAJ_VERSION == 0 && ENC_MIN_VERSION > 4) || ENC_MAJ_VERSION > 0
+  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
+  }
+#endif
+
   if (encode_config->quality >= 0 && encode_config->quality <= 100){
     config.quality = encode_config->quality;
   }
@@ -288,4 +296,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.4"
+  VERSION = "0.3.1"
 end

data/spec/travis_build.sh

@@ -1,8 +1,6 @@
 #/usr/bin/env sh
-wget http://webp.googlecode.com/files/libwebp-0.4.0.tar.gz
-tar xvzf libwebp-0.4.0.tar.gz
-cd libwebp-0.4.0
-./configure
-make
-sudo make install
-sudo ln -fs /usr/local/lib/libwebp.* /usr/lib/
+wget http://downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP_VERSION.tar.gz
+tar xvzf libwebp-$LIBWEBP_VERSION.tar.gz
+cd libwebp-$LIBWEBP_VERSION
+./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.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexey Vasyliev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -133,7 +133,7 @@ homepage: http://leopard.in.ua/webp-ffi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for libwebp
 test_files: