webp-ffi 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f324acb0231fe4a10343187cd018ae7d09580048
-  data.tar.gz: e82178d2e5945a9dbc249d46351faa7d1320890a
+  metadata.gz: 4faf9be4b898c23d0b6b8c035046f6b659878652
+  data.tar.gz: a3a0c25ecca3b5d402a4abac31f8f279a6ee1192
 SHA512:
-  metadata.gz: c3b829f324a7154866a68026db7d9074b63ad204c50af0ed0b85da400a7732642c0a9d7fe309ba305e79d1413c9cd65e0d2f90224d202ed724aca4e1446c5703
-  data.tar.gz: b8c39d2745d5a0b724718f422d3f2fbc3a19a634265cba885e23db10c34e954cb8f7f835b71f16a94270d215e8f0cd374c5c15df77d685f00fd2ab8acb5a5f70
+  metadata.gz: d44c413f3e4b72eb08377f179d6a0ada43549d36d5b3baf79ce38e4cb6e03f4ea6245937ea9edb53fd615c7abc5f59aeb873ab7c648c89293a884912d9b79f37
+  data.tar.gz: 123198f82ddfe778ab72614696afa54fbf7fb88497d1a4ef1107feb262cdcd4d9d322f008be36f580b5cd192b2dc6eb91fce5d352789f3a077d588ddb1c0b2c0

data/.travis.yml

@@ -17,5 +17,6 @@ branches:
     - development
 matrix:
   allow_failures:
+    - rvm: rbx-19mode
     - rvm: ruby-head
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.8
+
+* Fix decoder options (it was not working fully)
+
 ## v0.1.7
 
 * Bump FFI dependency to ~> 1.9.0

data/README.md

@@ -1,6 +1,6 @@
 # Webp-ffi
 
-[![Build Status](https://travis-ci.org/le0pard/webp-ffi.png)](https://travis-ci.org/le0pard/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)
 
 Ruby wrapper for libwebp. What is WebP?
@@ -17,16 +17,16 @@ First of all you should have install libraries: libpng, libjpeg and libwebp (for
 
 For ubuntu, debian:
 
-    sudo apt-get install libjpeg62-dev libpng12-dev libtiff4-dev
-    
+    sudo apt-get install libjpeg-dev libpng-dev libtiff-dev
+
 For Mac OS:
 
     sudo port install jpeg libpng tiff
-    
+
 or:
 
     brew install libjpg libpng libtiff
-    
+
 Next, you should [install libwebp](https://developers.google.com/speed/webp/docs/compiling).
 
 ### Final part
@@ -51,22 +51,22 @@ Basic info about libwebp (encoder and decoder versions):
 
     $ irb
     2.0.0p0 :001 > require 'webp_ffi'
-     => true 
+     => true
     2.0.0p0 :002 > WebP.decoder_version
-     => "0.2.0" 
+     => "0.3.1"
     2.0.0p0 :003 > WebP.encoder_version
-     => "0.2.0"
-     
+     => "0.3.1"
+
 
 ### WebP size (width and height)
-     
+
 Get size (width and height) from webp image:
 
     filename = File.expand_path(File.join(File.dirname(__FILE__), "spec/factories/4.webp"))
     WebP.webp_size(File.open(filename, "rb").read)
      => [2000, 2353]
-     
-    
+
+
 ### Encode WebP image
 
 Encode png, jpg or tiff image to webp:
@@ -74,14 +74,14 @@ Encode png, jpg or tiff image to webp:
     filename = File.expand_path(File.join(File.dirname(__FILE__), "spec/factories/4.png"))
     out_filename = File.expand_path(File.join(File.dirname(__FILE__), "tmp/4.webp"))
     WebP.encode(filename, out_filename)
-    
-     
+
+
 Encode png, jpg or tiff image to webp with options:
 
     WebP.encode(filename, out_filename, quality: 50, resize_w: 100, resize_h: 200)
     WebP.encode(filename, out_filename, quality: 75, crop_x: 0, cropt_y: 0, crop_w: 100, crop_h: 100)
-    
-    
+
+
 Possible encode options:
 
  * **lossless** (int) - Lossless encoding (0=lossy(default), 1=lossless)
@@ -106,7 +106,7 @@ Possible encode options:
  * **width** (int), **height** (int) - Input size (width x height) for YUV
  * **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)
- 
+
 ### Decode WebP image
 
 Decode webp image (default format is png):
@@ -114,8 +114,8 @@ Decode webp image (default format is png):
     filename = File.expand_path(File.join(File.dirname(__FILE__), "spec/factories/4.webp"))
     out_filename = File.expand_path(File.join(File.dirname(__FILE__), "tmp/4.png"))
     WebP.decode(filename, out_filename)
-    
-    
+
+
 Decode webp image to pam, ppm or pgm format of image:
 
     filename = File.expand_path(File.join(File.dirname(__FILE__), "spec/factories/4.webp"))
@@ -123,14 +123,14 @@ Decode webp image to pam, ppm or pgm format of image:
     WebP.decode(filename, out_filename, output_format: :pam)
     WebP.decode(filename, out_filename, output_format: :ppm)
     WebP.decode(filename, out_filename, output_format: :pgm)
-    
-    
+
+
 Decode webp image with options:
 
     WebP.encode(filename, out_filename, resize_w: 100, resize_h: 200)
     WebP.encode(filename, out_filename, crop_x: 0, cropt_y: 0, crop_w: 100, crop_h: 100)
-    
-    
+
+
 Possible decode options:
 
  * **bypass\_filtering** (bool) - disable in-loop filtering

data/ext/webp_ffi/webp_ffi.c

@@ -57,6 +57,13 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   int keep_alpha = 1;
   WebPPicture picture;
   WebPConfig config;
+
+  if (!WebPPictureInit(&picture) ||
+      !WebPConfigInit(&config)) {
+    //fprintf(stderr, "Error! Version mismatch!\n");
+    return 1;
+  }
+
   // OPTIONS BEGIN
   if (encode_config->lossless == 0 || encode_config->lossless == 1){
     config.lossless = encode_config->lossless;
@@ -120,25 +127,19 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
     picture.height = encode_config->height;
   }
   // OPTIONS END
-  
-  if (!WebPPictureInit(&picture) ||
-      !WebPConfigInit(&config)) {
-    //fprintf(stderr, "Error! Version mismatch!\n");
-    return 1;
-  }
-  
+
   if (!WebPValidateConfig(&config)) {
     //fprintf(stderr, "Error! Invalid configuration.\n");
     return_value = 2;
     goto Error;
   }
-  
+
   if (!UtilReadPicture(in_file, &picture, keep_alpha)) {
     //fprintf(stderr, "Error! Cannot read input picture file '%s'\n", in_file);
     return_value = 3;
     goto Error;
   }
-  
+
   out = fopen(out_file, "wb");
   if (out == NULL) {
     //fprintf(stderr, "Error! Cannot open output file '%s'\n", out_file);
@@ -147,7 +148,7 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   }
   picture.writer = EncodeWriter;
   picture.custom_ptr = (void*)out;
-  
+
   if ((encode_config->crop_w | encode_config->crop_h) > 0){
     if (!WebPPictureView(&picture, encode_config->crop_x, encode_config->crop_y, encode_config->crop_w, encode_config->crop_h, &picture)) {
       //fprintf(stderr, "Error! Cannot crop picture\n");
@@ -155,7 +156,7 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
       goto Error;
     }
   }
-  
+
   if ((encode_config->resize_w | encode_config->resize_h) > 0) {
     if (!WebPPictureRescale(&picture, encode_config->resize_w, encode_config->resize_h)) {
       //fprintf(stderr, "Error! Cannot resize picture\n");
@@ -163,18 +164,18 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
       goto Error;
     }
   }
-  
+
   if (picture.extra_info_type > 0) {
     AllocExtraInfo(&picture);
   }
-  
+
   if (!WebPEncode(&config, &picture)) {
     //fprintf(stderr, "Error! Cannot encode picture as WebP\n");
     return_value = 7;
     goto Error;
   }
   return_value = 0;
-  
+
 Error:
   free(picture.extra_info);
   WebPPictureFree(&picture);
@@ -198,7 +199,7 @@ int webp_decode(const char *in_file, const char *out_file, const FfiWebpDecodeCo
     //fprintf(stderr, "Library version mismatch!\n");
     return 1;
   }
-  
+
   if (decode_config->output_format != format){
     format = decode_config->output_format;
   }
@@ -223,20 +224,20 @@ int webp_decode(const char *in_file, const char *out_file, const FfiWebpDecodeCo
     config.options.scaled_width  = decode_config->resize_w;
     config.options.scaled_height = decode_config->resize_h;
   }
-  
+
   VP8StatusCode status = VP8_STATUS_OK;
   size_t data_size = 0;
   const uint8_t* data = NULL;
-  
+
   if (!UtilReadFile(in_file, &data, &data_size)) return -1;
-  
+
   status = WebPGetFeatures(data, data_size, bitstream);
   if (status != VP8_STATUS_OK) {
     //fprintf(stderr, "This is invalid webp image!\n");
     return_value = 2;
     goto Error;
   }
-  
+
   switch (format) {
     case PNG:
       output_buffer->colorspace = bitstream->has_alpha ? MODE_RGBA : MODE_RGB;
@@ -258,7 +259,7 @@ int webp_decode(const char *in_file, const char *out_file, const FfiWebpDecodeCo
       return 3;
   }
   status = WebPDecode(data, data_size, &config);
-  
+
   if (status != VP8_STATUS_OK) {
     //fprintf(stderr, "Decoding of %s failed.\n", in_file);
     return_value = 4;
@@ -266,8 +267,8 @@ int webp_decode(const char *in_file, const char *out_file, const FfiWebpDecodeCo
   }
   UtilSaveOutput(output_buffer, format, out_file);
   return_value = 0;
-  
-Error:  
+
+Error:
   free((void*)data);
   WebPFreeDecBuffer(output_buffer);
   return return_value;

data/lib/webp/version.rb

@@ -1,3 +1,3 @@
 module WebP
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/spec_helper.rb

@@ -3,5 +3,7 @@ require 'rspec'
 require File.dirname(__FILE__) + "/../lib/webp_ffi"
 
 RSpec.configure do |config|
-  
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

data/spec/webp_ffi_spec.rb

@@ -29,7 +29,7 @@ describe WebP do
       }
     }
   }
-  
+
   before :all do
     @out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
     Dir.mkdir(@out_dir) unless File.exists?(@out_dir)
@@ -42,29 +42,29 @@ describe WebP do
   end
 
   it "calculate plus 100 by test_c (verify C)" do
-    WebP::C.test_c(100).should == 200
-    WebP::C.test_c(150).should == 250
+    expect(WebP::C.test_c(100)).to eq(200)
+    expect(WebP::C.test_c(150)).to eq(250)
   end
-  
+
   it "decoder version" do
-    WebP.decoder_version.should_not be_nil
-    WebP.decoder_version.should =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/
+    expect(WebP.decoder_version).not_to be_nil
+    expect(WebP.decoder_version).to match(/^([0-9]+)\.([0-9]+)\.([0-9]+)$/)
   end
-  
+
   it "encoder version" do
-    WebP.encoder_version.should_not be_nil
-    WebP.decoder_version.should =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/
+    expect(WebP.encoder_version).not_to be_nil
+    expect(WebP.decoder_version).to match(/^([0-9]+)\.([0-9]+)\.([0-9]+)$/)
   end
-  
+
   context "webp_size" do
     factories[:webp].each do |image|
       it "#{image} image size == #{factories[:info][image][:size]}" do
         filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.webp"))
         data = File.open(filename, "rb").read
         info = WebP.webp_size(data)
-        info.class.should == Array
-        info.size.should == 2
-        info.should == factories[:info][image][:size]
+        expect(info.class).to eq(Array)
+        expect(info.size).to eq(2)
+        expect(info).to eq(factories[:info][image][:size])
       end
     end
     it "raise InvalidImageFormatError for non-webp image" do
@@ -73,27 +73,27 @@ describe WebP do
       expect { WebP.webp_size(data) }.to raise_error WebP::InvalidImageFormatError
     end
   end
-  
+
   context "encode" do
     factories[:png].each do |image|
       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"))
-        WebP.encode(in_filename, out_filename).should be_true
+        expect(WebP.encode(in_filename, out_filename)).to be_true
       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"))
-        WebP.encode(in_filename, out_filename).should be_true
+        expect(WebP.encode(in_filename, out_filename)).to be_true
       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"))
-        WebP.encode(in_filename, out_filename).should be_true
+        expect(WebP.encode(in_filename, out_filename)).to be_true
       end
     end
     factories[:webp].each do |image|
@@ -122,13 +122,13 @@ describe WebP do
       end
     end
   end
-  
+
   context "decode" do
     factories[:webp].each do |image|
       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"))
-        WebP.decode(in_filename, out_filename).should be_true
+        expect(WebP.decode(in_filename, out_filename)).to be_true
       end
     end
     context "with output_format" do
@@ -137,7 +137,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"))
-            WebP.decode(in_filename, out_filename, output_format: output_format).should be_true
+            expect(WebP.decode(in_filename, out_filename, output_format: output_format)).to be_true
           end
         end
       end
@@ -147,12 +147,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"))
-          WebP.decode(in_filename, out_filename, crop_w: 200, crop_h: 200).should be_true
+          expect(WebP.decode(in_filename, out_filename, crop_w: 200, crop_h: 200)).to be_true
         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"))
-          WebP.decode(in_filename, out_filename, resize_w: 200, resize_h: 200).should be_true
+          expect(WebP.decode(in_filename, out_filename, resize_w: 200, resize_h: 200)).to be_true
         end
       end
     end

data/webp-ffi.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    << 'ext/webp_ffi/Rakefile'
 
-  spec.add_runtime_dependency "ffi", "~> 1.9.0"
-  spec.add_runtime_dependency "ffi-compiler", "~> 0.1.2"
+  spec.add_runtime_dependency "ffi", ">= 1.9.0"
+  spec.add_runtime_dependency "ffi-compiler", ">= 0.1.2"
 
   spec.add_development_dependency "bundler", ">= 1.2"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", ">= 2.14.0"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Alexey Vasyliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 description: Ruby wrapper for libwebp
 email:
 - leopard.not.a@gmail.com