webp-ffi 0.2.3 → 0.3.0

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.3"
+  VERSION = "0.3.0"
 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

@@ -79,21 +79,33 @@ describe WebP do
       it "#{image}.png image" do
         in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.png"))
         out_filename = File.expand_path(File.join(@out_dir, "#{image}.png.webp"))
-        expect(WebP.encode(in_filename, out_filename)).to be_true
+        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
         in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.jpg"))
         out_filename = File.expand_path(File.join(@out_dir, "#{image}.jpg.webp"))
-        expect(WebP.encode(in_filename, out_filename)).to be_true
+        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
         in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.tif"))
         out_filename = File.expand_path(File.join(@out_dir, "#{image}.tif.webp"))
-        expect(WebP.encode(in_filename, out_filename)).to be_true
+        expect(WebP.encode(in_filename, out_filename)).to be_truthy
       end
     end
     factories[:webp].each do |image|
@@ -128,7 +140,7 @@ describe WebP do
       it "#{image}.webp image" do
         in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.webp"))
         out_filename = File.expand_path(File.join(@out_dir, "#{image}.webp.png"))
-        expect(WebP.decode(in_filename, out_filename)).to be_true
+        expect(WebP.decode(in_filename, out_filename)).to be_truthy
       end
     end
     context "with output_format" do
@@ -137,7 +149,7 @@ describe WebP do
           it "#{image}.webp image to #{output_format}" do
             in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.webp"))
             out_filename = File.expand_path(File.join(@out_dir, "#{image}.#{output_format}.png"))
-            expect(WebP.decode(in_filename, out_filename, output_format: output_format)).to be_true
+            expect(WebP.decode(in_filename, out_filename, output_format: output_format)).to be_truthy
           end
         end
       end
@@ -147,12 +159,12 @@ describe WebP do
         it "#{image}.webp image to png and crop" do
           in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.webp"))
           out_filename = File.expand_path(File.join(@out_dir, "#{image}_crop.png"))
-          expect(WebP.decode(in_filename, out_filename, crop_w: 200, crop_h: 200)).to be_true
+          expect(WebP.decode(in_filename, out_filename, crop_w: 200, crop_h: 200)).to be_truthy
         end
         it "#{image}.webp image to png and scale" do
           in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.webp"))
           out_filename = File.expand_path(File.join(@out_dir, "#{image}_resize.png"))
-          expect(WebP.decode(in_filename, out_filename, resize_w: 200, resize_h: 200)).to be_true
+          expect(WebP.decode(in_filename, out_filename, resize_w: 200, resize_h: 200)).to be_truthy
         end
       end
     end
@@ -176,4 +188,4 @@ describe WebP do
     end
   end
 
-end
+end

data/webp-ffi.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", ">= 1.2"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 2.14.0"
+  spec.add_development_dependency "rspec", ">= 3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexey Vasyliev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3'
 description: Ruby wrapper for libwebp
 email:
 - leopard.not.a@gmail.com
@@ -97,6 +97,12 @@ files:
 - README.md
 - Rakefile
 - ext/webp_ffi/Rakefile
+- ext/webp_ffi/jpegdec.c
+- ext/webp_ffi/jpegdec.h
+- ext/webp_ffi/pngdec.c
+- ext/webp_ffi/pngdec.h
+- ext/webp_ffi/tiffdec.c
+- ext/webp_ffi/tiffdec.h
 - ext/webp_ffi/util.c
 - ext/webp_ffi/util.h
 - ext/webp_ffi/webp_ffi.c
@@ -127,7 +133,7 @@ homepage: http://leopard.in.ua/webp-ffi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,9 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for libwebp
 test_files: