webp-ffi 0.1.1 → 0.1.2

data/.travis.yml

@@ -19,5 +19,4 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: rbx-19mode
+    - rvm: jruby-19mode

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+## v0.1.2
+
+* Added all possible encode options (also added this options in readme)
+* Added error class for encode errors
+
+## v0.1.1
+
+* Added encode options
+
+## v0.1.0
+
+* First release

data/Gemfile

@@ -1,6 +1,4 @@
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in webp-ffi.gemspec
-gemspec
-
-gem 'ffi-compiler', github: 'ffi/ffi-compiler'
+gemspec

data/README.md

@@ -45,6 +45,8 @@ Or install it yourself as:
 
 ## Usage
 
+### Encode end Decoder versions
+
 Basic info about libwebp (encoder and decoder versions):
 
     $ irb
@@ -54,6 +56,8 @@ Basic info about libwebp (encoder and decoder versions):
      => "0.2.0" 
     2.0.0p0 :003 > WebpFfi.encoder_version
      => "0.2.0"
+
+### WebP size (width and height)
      
 Get size (width and height) from webp image:
 
@@ -61,11 +65,7 @@ Get size (width and height) from webp image:
     WebpFfi.webp_size(File.open(filename, "rb").read)
      => [2000, 2353]
     
-Decode webp image to 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"))
-    WebpFfi.decode(filename, out_filename)
+### Encode png, jpg or tiff image to WebP image
 
 Encode png, jpg or tiff image to webp:
 
@@ -77,6 +77,39 @@ Encode png, jpg or tiff image to webp (with options):
 
     WebpFfi.encode(filename, out_filename, quality: 50, resize_w: 100, resize_h: 200)
     WebpFfi.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)
+ * **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
+ * **target\_PSNR** (float) - if non-zero, specifies the minimal distortion to try to achieve. Takes precedence over target\_size
+ * **segments** (int) - maximum number of segments to use, in [1..4]
+ * **sns_strength** (int) - Spatial Noise Shaping. 0=off, 100=maximum
+ * **filter\_strength** (int) - range: [0 = off .. 100 = strongest]
+ * **filter\_sharpness** (int) - range: [0 = off .. 7 = least sharp]
+ * **filter\_type** (int) - filtering type: 0 = simple, 1 = strong (only used if filter\_strength > 0 or autofilter > 0)
+ * **autofilter** (int) - Auto adjust filter's strength [0 = off, 1 = on]
+ * **alpha\_compression** (int) - Algorithm for encoding the alpha plane (0 = none, 1 = compressed with WebP lossless). Default is 1
+ * **alpha\_filtering** (int) - Predictive filtering method for alpha plane. 0: none, 1: fast, 2: best. Default if 1
+ * **alpha\_quality** (int) - Between 0 (smallest size) and 100 (lossless). Default is 100
+ * **pass** (int) - number of entropy-analysis passes (in [1..10])
+ * **show\_compressed** (int) - if true, export the compressed picture back. In-loop filtering is not applied
+ * **preprocessing** (int) - preprocessing filter (0=none, 1=segment-smooth)
+ * **partitions** (int) - log2(number of token partitions) in [0..3]. Default is set to 0 for easier progressive decoding
+ * **partition\_limit** (int) - quality degradation allowed to fit the 512k limit on prediction modes coding (0: no degradation, 100: maximum possible degradation)
+ * **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 to png image
+
+Decode webp image to 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"))
+    WebpFfi.decode(filename, out_filename)
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'bundler/setup'
 require 'rake'
 require 'rake/clean'

data/ext/webp_ffi/util.c

@@ -267,7 +267,7 @@ static int UtilReadTIFF(const char* const filename,
   int dircount = 1;
 
   if (tif == NULL) {
-    fprintf(stderr, "Error! Cannot open TIFF file '%s'\n", filename);
+    //fprintf(stderr, "Error! Cannot open TIFF file '%s'\n", filename);
     return 0;
   }
 
@@ -298,7 +298,7 @@ static int UtilReadTIFF(const char* const filename,
     }
     _TIFFfree(raster);
   } else {
-    fprintf(stderr, "Error allocating TIFF RGBA memory!\n");
+    //fprintf(stderr, "Error allocating TIFF RGBA memory!\n");
   }
 
   if (ok && keep_alpha == 2) {
@@ -335,7 +335,7 @@ int UtilReadPicture(const char* const filename, WebPPicture* const pic,
   int ok = 0;
   FILE* in_file = fopen(filename, "rb");
   if (in_file == NULL) {
-    fprintf(stderr, "Error! Cannot open input file '%s'\n", filename);
+    //fprintf(stderr, "Error! Cannot open input file '%s'\n", filename);
     return ok;
   }
 
@@ -353,9 +353,6 @@ int UtilReadPicture(const char* const filename, WebPPicture* const pic,
     // If image size is specified, infer it as YUV format.
     ok = UtilReadYUV(in_file, pic);
   }
-  if (!ok) {
-    fprintf(stderr, "Error! Could not process file %s\n", filename);
-  }
 
   fclose(in_file);
   return ok;
@@ -369,7 +366,7 @@ int UtilSaveOutput(const WebPDecBuffer* const buffer,
   fout = fopen(out_file, "wb");
   if (!fout) {
     fprintf(stderr, "Error opening output file %s\n", out_file);
-    return;
+    return 0;
   }
 
   if (format == PNG) {

data/ext/webp_ffi/webp_ffi.c

@@ -51,69 +51,6 @@ int webp_get_info(const uint8_t* data, size_t data_size, int* width, int* height
 
 
 
-int webp_decode(const char *in_file, const char *out_file) {
-  int return_value = -1;
-  WebPDecoderConfig config;
-  WebPDecBuffer* const output_buffer = &config.output;
-  WebPBitstreamFeatures* const bitstream = &config.input;
-  OutputFileFormat format = PNG;
-
-  if (!WebPInitDecoderConfig(&config)) {
-    fprintf(stderr, "Library version mismatch!\n");
-    return 1;
-  }
-  
-  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;
-      break;
-    case PAM:
-      output_buffer->colorspace = MODE_RGBA;
-      break;
-    case PPM:
-      output_buffer->colorspace = MODE_RGB;  // drops alpha for PPM
-      break;
-    case PGM:
-      output_buffer->colorspace = bitstream->has_alpha ? MODE_YUVA : MODE_YUV;
-      break;
-    case ALPHA_PLANE_ONLY:
-      output_buffer->colorspace = MODE_YUVA;
-      break;
-    default:
-      free((void*)data);
-      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;
-    goto Error;
-  }
-  UtilSaveOutput(output_buffer, format, out_file);
-  return_value = 0;
-  
-Error:  
-  free((void*)data);
-  WebPFreeDecBuffer(output_buffer);
-  return return_value;
-}
-
-
-
 int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeConfig *encode_config) {
   int return_value = -1;
   FILE *out = NULL;
@@ -121,56 +58,90 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   WebPPicture picture;
   WebPConfig config;
   // config
-  if (encode_config->lossless && (encode_config->lossless == 0 || encode_config->lossless == 1)){
+  if (encode_config->lossless == 0 || encode_config->lossless == 1){
     config.lossless = encode_config->lossless;
   }
-  if (encode_config->quality){
+  if (encode_config->quality >= 0 && encode_config->quality <= 100){
     config.quality = encode_config->quality;
   }
   if (encode_config->method >= 0 && encode_config->method <= 6){
     config.method = encode_config->method;
   }
-  if (encode_config->segments){
+  if (encode_config->target_size > 0){
+    config.target_size = encode_config->target_size;
+  }
+  if (encode_config->target_PSNR > 0){
+    config.target_PSNR = encode_config->target_PSNR;
+  }
+  if (encode_config->segments >= 0 && encode_config->segments <= 4){
     config.segments = encode_config->segments;
   }
-  if (encode_config->sns_strength){
+  if (encode_config->sns_strength >= 0 && encode_config->sns_strength <= 100){
     config.sns_strength = encode_config->sns_strength;
   }
-  if (encode_config->alpha_quality){
-    config.alpha_quality = encode_config->alpha_quality;
+  if (encode_config->filter_strength >= 0 && encode_config->filter_strength <= 100){
+    config.filter_strength = encode_config->filter_strength;
+  }
+  if (encode_config->filter_sharpness >= 0 && encode_config->filter_sharpness <= 7){
+    config.filter_sharpness = encode_config->filter_sharpness;
   }
-  if (encode_config->alpha_compression){
+  if (encode_config->filter_type == 0 || encode_config->filter_type == 1){
+    config.filter_type = encode_config->filter_type;
+  }
+  if (encode_config->autofilter == 0 || encode_config->autofilter == 1){
+    config.autofilter = encode_config->autofilter;
+  }
+  if (encode_config->alpha_compression == 0 || encode_config->alpha_compression == 1){
     config.alpha_compression = encode_config->alpha_compression;
   }
-  if (encode_config->alpha_filtering){
+  if (encode_config->alpha_filtering >= 0 && encode_config->alpha_filtering <= 2){
     config.alpha_filtering = encode_config->alpha_filtering;
   }
-  if (encode_config->width && encode_config->height){
+  if (encode_config->alpha_quality >= 0 && encode_config->alpha_quality <= 100){
+    config.alpha_quality = encode_config->alpha_quality;
+  }
+  if (encode_config->pass >= 0 && encode_config->pass <= 10){
+    config.pass = encode_config->pass;
+  }
+  if (encode_config->show_compressed >= 0){
+    config.show_compressed = encode_config->show_compressed;
+  }
+  if (encode_config->preprocessing == 0 || encode_config->preprocessing == 1){
+    config.preprocessing = encode_config->preprocessing;
+  }
+  if (encode_config->partitions >= 0 && encode_config->partitions <= 3){
+    config.partitions = encode_config->partitions;
+  }
+  if (encode_config->partition_limit >= 0 && encode_config->partition_limit <= 100){
+    config.partition_limit = encode_config->partition_limit;
+  }
+  
+  if ((encode_config->width | encode_config->height) > 0){
     picture.width = encode_config->width;
     picture.height = encode_config->height;
   }
   
   if (!WebPPictureInit(&picture) ||
       !WebPConfigInit(&config)) {
-    fprintf(stderr, "Error! Version mismatch!\n");
+    //fprintf(stderr, "Error! Version mismatch!\n");
     return 1;
   }
   
   if (!WebPValidateConfig(&config)) {
-    fprintf(stderr, "Error! Invalid configuration.\n");
+    //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);
+    //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);
+    //fprintf(stderr, "Error! Cannot open output file '%s'\n", out_file);
     return_value = 4;
     goto Error;
   }
@@ -179,7 +150,7 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   
   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");
+      //fprintf(stderr, "Error! Cannot crop picture\n");
       return_value = 5;
       goto Error;
     }
@@ -187,7 +158,7 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   
   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");
+      //fprintf(stderr, "Error! Cannot resize picture\n");
       return_value = 6;
       goto Error;
     }
@@ -198,8 +169,8 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   }
   
   if (!WebPEncode(&config, &picture)) {
-    fprintf(stderr, "Error! Cannot encode picture as WebP\n");
-    return_value = 10;
+    //fprintf(stderr, "Error! Cannot encode picture as WebP\n");
+    return_value = 7;
     goto Error;
   }
   return_value = 0;
@@ -214,6 +185,70 @@ Error:
   return return_value;
 }
 
+
+
+int webp_decode(const char *in_file, const char *out_file) {
+  int return_value = -1;
+  WebPDecoderConfig config;
+  WebPDecBuffer* const output_buffer = &config.output;
+  WebPBitstreamFeatures* const bitstream = &config.input;
+  OutputFileFormat format = PNG;
+
+  if (!WebPInitDecoderConfig(&config)) {
+    fprintf(stderr, "Library version mismatch!\n");
+    return 1;
+  }
+  
+  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;
+      break;
+    case PAM:
+      output_buffer->colorspace = MODE_RGBA;
+      break;
+    case PPM:
+      output_buffer->colorspace = MODE_RGB;  // drops alpha for PPM
+      break;
+    case PGM:
+      output_buffer->colorspace = bitstream->has_alpha ? MODE_YUVA : MODE_YUV;
+      break;
+    case ALPHA_PLANE_ONLY:
+      output_buffer->colorspace = MODE_YUVA;
+      break;
+    default:
+      free((void*)data);
+      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;
+    goto Error;
+  }
+  UtilSaveOutput(output_buffer, format, out_file);
+  return_value = 0;
+  
+Error:  
+  free((void*)data);
+  WebPFreeDecBuffer(output_buffer);
+  return return_value;
+}
+
+
 // test
 int test_c(int n) {
   return n + 100;

data/ext/webp_ffi/webp_ffi.h

@@ -9,11 +9,35 @@ extern "C" {
     int lossless;           // Lossless encoding (0=lossy(default), 1=lossless).
     float quality;          // between 0 (smallest file) and 100 (biggest)
     int method;             // quality/speed trade-off (0=fast, 6=slower-better)
+
+    // Parameters related to lossy compression only:
+    int target_size;        // if non-zero, set the desired target size in bytes.
+                            // Takes precedence over the 'compression' parameter.
+    float target_PSNR;      // if non-zero, specifies the minimal distortion to
+                            // try to achieve. Takes precedence over target_size.
     int segments;           // maximum number of segments to use, in [1..4]
     int sns_strength;       // Spatial Noise Shaping. 0=off, 100=maximum.
-    int alpha_quality;      // Between 0 (smallest size) and 100 (lossless). Default is 100.
-    int alpha_compression;  // Algorithm for encoding the alpha plane
+    int filter_strength;    // range: [0 = off .. 100 = strongest]
+    int filter_sharpness;   // range: [0 = off .. 7 = least sharp]
+    int filter_type;        // filtering type: 0 = simple, 1 = strong (only used
+                            // if filter_strength > 0 or autofilter > 0)
+    int autofilter;         // Auto adjust filter's strength [0 = off, 1 = on]
+    int alpha_compression;  // Algorithm for encoding the alpha plane (0 = none,
+                            // 1 = compressed with WebP lossless). Default is 1.
     int alpha_filtering;    // Predictive filtering method for alpha plane.
+                            //  0: none, 1: fast, 2: best. Default if 1.
+    int alpha_quality;      // Between 0 (smallest size) and 100 (lossless).
+                            // Default is 100.
+    int pass;               // number of entropy-analysis passes (in [1..10]).
+
+    int show_compressed;    // if true, export the compressed picture back.
+                            // In-loop filtering is not applied.
+    int preprocessing;      // preprocessing filter (0=none, 1=segment-smooth)
+    int partitions;         // log2(number of token partitions) in [0..3]
+                            // Default is set to 0 for easier progressive decoding.
+    int partition_limit;    // quality degradation allowed to fit the 512k limit on
+                            // prediction modes coding (0: no degradation,
+                            // 100: maximum possible degradation).
     int width;
     int height;
     int crop_x;
@@ -23,12 +47,13 @@ extern "C" {
     int resize_w;
     int resize_h;
   } FfiWebpEncodeConfig;
+  
 
   void decoder_version(char *version);
   void encoder_version(char *version);
   int webp_get_info(const uint8_t* data, size_t data_size, int* width, int* height);
-  int webp_decode(const char *in_file, const char *out_file);
   int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeConfig *encode_config);
+  int webp_decode(const char *in_file, const char *out_file);
   int test_c(int n);
 
 #if defined(__cplusplus) || defined(c_plusplus)

data/lib/webp_ffi/c.rb

@@ -5,11 +5,23 @@ module WebpFfi
       layout  :lossless, :int,
         :quality, :float,
         :method, :int,
+        :target_size, :int,
+        :target_PSNR, :float,
         :segments, :int,
         :sns_strength, :int,
-        :alpha_quality, :int,
+        :filter_strength, :int,
+        :filter_sharpness, :int,
+        :filter_type, :int,
+        :autofilter, :int,
         :alpha_compression, :int,
         :alpha_filtering, :int,
+        :alpha_quality, :int,
+        :pass, :int,
+        :show_compressed, :int,
+        :preprocessing, :int,
+        :partitions, :int,
+        :partition_limit, :int,
+        # image
         :width, :int,
         :height, :int,
         :crop_x, :int,
@@ -24,8 +36,8 @@ module WebpFfi
     attach_function :decoder_version, [:pointer], :void
     attach_function :encoder_version, [:pointer], :void
     attach_function :webp_get_info, [:pointer, :size_t, :pointer, :pointer], :int
-    attach_function :webp_decode, [:string, :string], :int
     attach_function :webp_encode, [:string, :string, :pointer], :int
+    attach_function :webp_decode, [:string, :string], :int
 
     attach_function :test_c, [:int], :int
   end

data/lib/webp_ffi/error.rb

@@ -1,3 +1,15 @@
 module WebpFfi
+  
+  ENCODER_ERRORS = [
+    "Version mismatch", 
+    "Invalid configuration", 
+    "Cannot read input picture file", 
+    "Cannot open output file", 
+    "Cannot crop picture", 
+    "Cannot resize picture",
+    "Cannot encode picture as WebP"]
+  
   class InvalidImageFormatError < StandardError; end
+  class EncoderError < StandardError; end
+  class DecoderError < StandardError; end
 end

data/lib/webp_ffi/options.rb

@@ -14,10 +14,13 @@ module WebpFfi
       options_struct[:crop_w] = options_struct[:crop_h] = 0
       options_struct[:resize_w] = options_struct[:resize_h] = 0
       # users
-      [:lossless, :quality, :method, :segments, :sns_strength, 
-        :alpha_quality, :alpha_compression, :alpha_filtering, :width, :height,
-        :crop_x, :crop_y, :crop_w, :crop_h, :resize_w, :resize_h].each do |key|
-        options_struct[key] = @user_options[key] if @user_options[key]
+      [:lossless, :quality, :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, 
+        :partition_limit, :width, :height, :crop_x, :crop_y, :crop_w, 
+        :crop_h, :resize_w, :resize_h].each do |key|
+          options_struct[key] = @user_options[key] if @user_options[key]
       end
       options_pointer
     end

data/lib/webp_ffi/version.rb

@@ -1,3 +1,3 @@
 module WebpFfi
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/webp_ffi/webp_ffi.rb

@@ -19,28 +19,36 @@ module WebpFfi
     # get webp image size
     def webp_size(data)
       return nil if data.nil?
-      size = data.respond_to?(:bytesize) ? data.bytesize : data.size
-      width_ptr = FFI::MemoryPointer.new(:int, 2)
-      height_ptr = FFI::MemoryPointer.new(:int, 2)
-      memBuf = FFI::MemoryPointer.new(:char, size)
-      memBuf.put_bytes(0, data)
-      if C.webp_get_info(memBuf, size, width_ptr, height_ptr) == 0
-        [width_ptr.null? ? nil : width_ptr.read_int, height_ptr.null? ? nil : height_ptr.read_int]
+      pointers = get_pointers_for_webp_size(data)
+      if 0 == C.webp_get_info(pointers[:data], pointers[:data_size], pointers[:width], pointers[:height])
+        [(pointers[:width].null? ? nil : pointers[:width].read_int), (pointers[:height].null? ? nil : pointers[:height].read_int)]
       else
-        raise InvalidImageFormatError, "invalid webp image"
-        return nil
+        raise InvalidImageFormatError, "invalid WebP image data"
       end
     end
     
+    # encode
+    def encode(input_file, output_file, options = {})
+      options_obj = Options.new options
+      res = C.webp_encode(input_file, output_file, options_obj.encode_pointer)
+      raise EncoderError, ENCODER_ERRORS[res - 1] unless 0 == res
+      return true
+    end
+    
     # decode
     def decode(input_file, output_file, options = {})
-      C.webp_decode(input_file, output_file)
+      res = C.webp_decode(input_file, output_file)
+      return true
     end
     
-    # encode
-    def encode(input_file, output_file, options = {})
-      options_obj = Options.new options
-      C.webp_encode(input_file, output_file, options_obj.encode_pointer)
+    private
+    
+    def get_pointers_for_webp_size(data)
+      pointers = Hash.new
+      pointers[:data_size] = data.respond_to?(:bytesize) ? data.bytesize : data.size
+      pointers[:width], pointers[:height] = FFI::MemoryPointer.new(:int, 2), FFI::MemoryPointer.new(:int, 2)
+      pointers[:data] = FFI::MemoryPointer.new(:char, pointers[:data_size]).put_bytes(0, data)
+      pointers
     end
     
   end

data/spec/webp_ffi_spec.rb

@@ -37,8 +37,13 @@ describe WebpFfi do
       }
     }
   }
+  
+  before :all do
+    @out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
+    Dir.mkdir(@out_dir) unless File.exists?(@out_dir)
+  end
 
-  it "calculate plus 100 by test" do
+  it "calculate plus 100 by test_c (verify C)" do
     WebpFfi::C.test_c(100).should == 200
     WebpFfi::C.test_c(150).should == 250
   end
@@ -71,51 +76,38 @@ describe WebpFfi do
     end
   end
   
-  context "decode" do
-    factories[:webp].each do |image|
-      it "#{image}.webp image" do
-        out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
-        Dir.mkdir(out_dir) unless File.exists?(out_dir)
-        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"))
-        WebpFfi.decode(in_filename, out_filename)
-      end
-    end
-  end
-  
   context "encode" do
-    before :all do
-      @out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
-      Dir.mkdir(@out_dir) unless File.exists?(@out_dir)
-    end
     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"))
-        WebpFfi.encode(in_filename, out_filename)
+        WebpFfi.encode(in_filename, out_filename).should 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"))
-        WebpFfi.encode(in_filename, out_filename)
+        WebpFfi.encode(in_filename, out_filename).should 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"))
-        WebpFfi.encode(in_filename, out_filename)
+        WebpFfi.encode(in_filename, out_filename).should be_true
+      end
+    end
+    factories[:webp].each do |image|
+      it "raise EncoderError on #{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}invalid.webp.png"))
+        expect { WebpFfi.encode(in_filename, out_filename) }.to raise_error WebpFfi::EncoderError
       end
     end
   end
   
   context "encode with options" do
-    before :all do
-      @out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
-      Dir.mkdir(@out_dir) unless File.exists?(@out_dir)
-    end
     factories[:png].each do |image|
       it "#{image}.png image" do
         in_filename = File.expand_path(File.join(File.dirname(__FILE__), "factories/#{image}.png"))
@@ -124,5 +116,25 @@ describe WebpFfi do
       end
     end
   end
+  
+  context "raise EncoderError on invalid crop options" 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}.50png.webp"))
+        expect { WebpFfi.encode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebpFfi::EncoderError
+      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"))
+        WebpFfi.decode(in_filename, out_filename).should be_true
+      end
+    end
+  end
 
 end

data/webp-ffi.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.extensions    << 'ext/webp_ffi/Rakefile'
 
   spec.add_runtime_dependency "ffi", "~> 1.4.0"
-  #spec.add_runtime_dependency "ffi-compiler", "~> 0.1.1"
+  spec.add_runtime_dependency "ffi-compiler", "~> 0.1.2"
 
   spec.add_development_dependency "bundler", ">= 1.2"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: ffi-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +102,7 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -136,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4057552574747180548
+      hash: 2298624109850622941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4057552574747180548
+      hash: 2298624109850622941
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25