webp-ffi 0.1.3 → 0.1.4

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 before_install:
-  - ./spec/travis_build.sh
+  - ./spec/travis_build.sh > /dev/null 2>&1
 rvm:
   - 1.9.2
   - 1.9.3
@@ -18,5 +18,4 @@ branches:
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: jruby-19mode
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,10 +1,15 @@
+## v0.1.4
+
+* Added decode options
+* Added error class for decode errors
+
 ## v0.1.3
 
 * Rename module to WebP 
 
 ## v0.1.2
 
-* Added all possible encode options (also added this options in readme)
+* Added encode options
 * Added error class for encode errors
 
 ## v0.1.1

data/README.md

@@ -65,7 +65,7 @@ Get size (width and height) from webp image:
     WebP.webp_size(File.open(filename, "rb").read)
      => [2000, 2353]
     
-### Encode png, jpg or tiff image to WebP image
+### Encode WebP image
 
 Encode png, jpg or tiff image to webp:
 
@@ -73,7 +73,7 @@ Encode png, jpg or tiff image to webp:
     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):
+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)
@@ -103,13 +103,34 @@ Possible encode 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)
  
-### Decode WebP image to png image
+### Decode WebP image
 
-Decode webp image to png:
+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"))
+    out_filename = File.expand_path(File.join(File.dirname(__FILE__), "tmp/4.png"))
+    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
+ * **no\_fancy\_upsampling** (bool) - don't use the fancy YUV420 upscaler
+ * **use\_threads** (bool) - use multi-threading
+ * **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)
 
 ## Contributing
 

data/ext/webp_ffi/util.c

@@ -258,6 +258,74 @@ static int UtilWritePNG(FILE* out_file, const WebPDecBuffer* const buffer) {
   return 1;
 }
 
+static int UtilWritePPM(FILE* fout, const WebPDecBuffer* const buffer, int alpha) {
+  const uint32_t width = buffer->width;
+  const uint32_t height = buffer->height;
+  const unsigned char* const rgb = buffer->u.RGBA.rgba;
+  const int stride = buffer->u.RGBA.stride;
+  const size_t bytes_per_px = alpha ? 4 : 3;
+  uint32_t y;
+
+  if (alpha) {
+    fprintf(fout, "P7\nWIDTH %d\nHEIGHT %d\nDEPTH 4\nMAXVAL 255\n"
+                  "TUPLTYPE RGB_ALPHA\nENDHDR\n", width, height);
+  } else {
+    fprintf(fout, "P6\n%d %d\n255\n", width, height);
+  }
+  for (y = 0; y < height; ++y) {
+    if (fwrite(rgb + y * stride, width, bytes_per_px, fout) != bytes_per_px) {
+      return 0;
+    }
+  }
+  return 1;
+}
+
+static int UtilWriteAlphaPlane(FILE* fout, const WebPDecBuffer* const buffer) {
+  const uint32_t width = buffer->width;
+  const uint32_t height = buffer->height;
+  const unsigned char* const a = buffer->u.YUVA.a;
+  const int a_stride = buffer->u.YUVA.a_stride;
+  uint32_t y;
+  assert(a != NULL);
+  fprintf(fout, "P5\n%d %d\n255\n", width, height);
+  for (y = 0; y < height; ++y) {
+    if (fwrite(a + y * a_stride, width, 1, fout) != 1) {
+      return 0;
+    }
+  }
+  return 1;
+}
+
+static int UtilWritePGM(FILE* fout, const WebPDecBuffer* const buffer) {
+  const int width = buffer->width;
+  const int height = buffer->height;
+  const WebPYUVABuffer* const yuv = &buffer->u.YUVA;
+  // Save a grayscale PGM file using the IMC4 layout
+  // (http://www.fourcc.org/yuv.php#IMC4). This is a very
+  // convenient format for viewing the samples, esp. for
+  // odd dimensions.
+  int ok = 1;
+  int y;
+  const int uv_width = (width + 1) / 2;
+  const int uv_height = (height + 1) / 2;
+  const int out_stride = (width + 1) & ~1;
+  const int a_height = yuv->a ? height : 0;
+  fprintf(fout, "P5\n%d %d\n255\n", out_stride, height + uv_height + a_height);
+  for (y = 0; ok && y < height; ++y) {
+    ok &= (fwrite(yuv->y + y * yuv->y_stride, width, 1, fout) == 1);
+    if (width & 1) fputc(0, fout);    // padding byte
+  }
+  for (y = 0; ok && y < uv_height; ++y) {
+    ok &= (fwrite(yuv->u + y * yuv->u_stride, uv_width, 1, fout) == 1);
+    ok &= (fwrite(yuv->v + y * yuv->v_stride, uv_width, 1, fout) == 1);
+  }
+  for (y = 0; ok && y < a_height; ++y) {
+    ok &= (fwrite(yuv->a + y * yuv->a_stride, width, 1, fout) == 1);
+    if (width & 1) fputc(0, fout);    // padding byte
+  }
+  return ok;
+}
+
 static int UtilReadTIFF(const char* const filename,
                     WebPPicture* const pic, int keep_alpha) {
   TIFF* const tif = TIFFOpen(filename, "r");
@@ -371,18 +439,16 @@ int UtilSaveOutput(const WebPDecBuffer* const buffer,
 
   if (format == PNG) {
     ok &= UtilWritePNG(fout, buffer);
-  }
-  /*
   } else if (format == PAM) {
-    ok &= WritePPM(fout, buffer, 1);
+    ok &= UtilWritePPM(fout, buffer, 1);
   } else if (format == PPM) {
-    ok &= WritePPM(fout, buffer, 0);
+    ok &= UtilWritePPM(fout, buffer, 0);
   } else if (format == PGM) {
-    ok &= WritePGM(fout, buffer);
+    ok &= UtilWritePGM(fout, buffer);
   } else if (format == ALPHA_PLANE_ONLY) {
-    ok &= WriteAlphaPlane(fout, buffer);
+    ok &= UtilWriteAlphaPlane(fout, buffer);
   }
-  */
+
   if (fout) {
     fclose(fout);
   }

data/ext/webp_ffi/webp_ffi.c

@@ -57,7 +57,7 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   int keep_alpha = 1;
   WebPPicture picture;
   WebPConfig config;
-  // config
+  // OPTIONS BEGIN
   if (encode_config->lossless == 0 || encode_config->lossless == 1){
     config.lossless = encode_config->lossless;
   }
@@ -115,11 +115,11 @@ int webp_encode(const char *in_file, const char *out_file, const FfiWebpEncodeCo
   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;
   }
+  // OPTIONS END
   
   if (!WebPPictureInit(&picture) ||
       !WebPConfigInit(&config)) {
@@ -187,7 +187,7 @@ Error:
 
 
 
-int webp_decode(const char *in_file, const char *out_file) {
+int webp_decode(const char *in_file, const char *out_file, const FfiWebpDecodeConfig *decode_config) {
   int return_value = -1;
   WebPDecoderConfig config;
   WebPDecBuffer* const output_buffer = &config.output;
@@ -195,10 +195,35 @@ int webp_decode(const char *in_file, const char *out_file) {
   OutputFileFormat format = PNG;
 
   if (!WebPInitDecoderConfig(&config)) {
-    fprintf(stderr, "Library version mismatch!\n");
+    //fprintf(stderr, "Library version mismatch!\n");
     return 1;
   }
   
+  if (decode_config->output_format != format){
+    format = decode_config->output_format;
+  }
+  if (decode_config->no_fancy_upsampling > 0){
+    config.options.no_fancy_upsampling = 1;
+  }
+  if (decode_config->bypass_filtering > 0){
+    config.options.bypass_filtering = 1;
+  }
+  if (decode_config->use_threads > 0){
+    config.options.use_threads = 1;
+  }
+  if ((decode_config->crop_w | decode_config->crop_h) > 0){
+    config.options.use_cropping = 1;
+    config.options.crop_left   = decode_config->crop_x;
+    config.options.crop_top    = decode_config->crop_y;
+    config.options.crop_width  = decode_config->crop_w;
+    config.options.crop_height = decode_config->crop_h;
+  }
+  if ((decode_config->resize_w | decode_config->resize_h) > 0){
+    config.options.use_scaling = 1;
+    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;
@@ -207,7 +232,7 @@ int webp_decode(const char *in_file, const char *out_file) {
   
   status = WebPGetFeatures(data, data_size, bitstream);
   if (status != VP8_STATUS_OK) {
-    fprintf(stderr, "This is invalid webp image!\n");
+    //fprintf(stderr, "This is invalid webp image!\n");
     return_value = 2;
     goto Error;
   }
@@ -235,7 +260,7 @@ int webp_decode(const char *in_file, const char *out_file) {
   status = WebPDecode(data, data_size, &config);
   
   if (status != VP8_STATUS_OK) {
-    fprintf(stderr, "Decoding of %s failed.\n", in_file);
+    //fprintf(stderr, "Decoding of %s failed.\n", in_file);
     return_value = 4;
     goto Error;
   }

data/ext/webp_ffi/webp_ffi.h

@@ -38,22 +38,26 @@ extern "C" {
     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;
-    int crop_y;
-    int crop_w;
-    int crop_h;
-    int resize_w;
-    int resize_h;
+    int width, height;
+    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
+    int no_fancy_upsampling;            // if true, use faster pointwise upsampler
+    int crop_x, crop_y, crop_w, crop_h;
+    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);
   int webp_get_info(const uint8_t* data, size_t data_size, int* width, int* height);
   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 webp_decode(const char *in_file, const char *out_file, const FfiWebpDecodeConfig *decode_config);
   int test_c(int n);
 
 #if defined(__cplusplus) || defined(c_plusplus)

data/lib/webp/c.rb

@@ -1,5 +1,11 @@
 module WebP
   module C
+    # enum
+    OutputFileFormat = enum( :png, 0,
+                  :pam,
+                  :ppm,
+                  :pgm,
+                  :alpha_plane_only )
     # struct
     class FfiWebpEncodeConfig < FFI::Struct
       layout  :lossless, :int,
@@ -31,13 +37,26 @@ module WebP
         :resize_w, :int,
         :resize_h, :int
     end
+    
+    class FfiWebpDecodeConfig < FFI::Struct
+      layout  :output_format, OutputFileFormat,
+        :bypass_filtering, :int,
+        :no_fancy_upsampling, :int,
+        :crop_x, :int,
+        :crop_y, :int,
+        :crop_w, :int,
+        :crop_h, :int,
+        :resize_w, :int,
+        :resize_h, :int,
+        :use_threads, :int
+    end
 
     # webp lib functions
     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_encode, [:string, :string, :pointer], :int
-    attach_function :webp_decode, [:string, :string], :int
+    attach_function :webp_decode, [:string, :string, :pointer], :int
 
     attach_function :test_c, [:int], :int
   end

data/lib/webp/error.rb

@@ -8,6 +8,12 @@ module WebP
     "Cannot crop picture", 
     "Cannot resize picture",
     "Cannot encode picture as WebP"]
+    
+  DECODER_ERRORS = [
+    "Version mismatch", 
+    "Invalid webp image", 
+    "Invalid output format",
+    "Decoding failed"]
   
   class InvalidImageFormatError < StandardError; end
   class EncoderError < StandardError; end

data/lib/webp/options.rb

@@ -8,22 +8,57 @@ module WebP
     def encode_pointer
       options_pointer = FFI::MemoryPointer.new :char, C::FfiWebpEncodeConfig.size, false
       options_struct = C::FfiWebpEncodeConfig.new options_pointer
-      # default
-      options_struct[:quality] = 100
-      options_struct[:crop_x] = options_struct[:crop_y] = 0
-      options_struct[:crop_w] = options_struct[:crop_h] = 0
-      options_struct[:resize_w] = options_struct[:resize_h] = 0
-      # users
-      [:lossless, :quality, :method, :target_size, :target_PSNR, 
-        :segments, :sns_strength, :filter_strength, :filter_sharpness, 
+      [: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, 
-        :partition_limit, :width, :height, :crop_x, :crop_y, :crop_w, 
+        :partition_limit, :width, :height].each do |key|
+          options_struct[key] = @user_options[key] ? @user_options[key] : -1
+      end
+      encode_default(options_struct)
+      [:quality, :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
+    
+    def decode_pointer
+      options_pointer = FFI::MemoryPointer.new :char, C::FfiWebpDecodeConfig.size, false
+      options_struct = C::FfiWebpDecodeConfig.new options_pointer
+      decode_default(options_struct)
+      # options
+      if @user_options[:output_format] && [:png, :pam, :ppm, :pgm, :alpha_plane_only].include?(@user_options[:output_format])
+        options_struct[:output_format] = C::OutputFileFormat[@user_options[:output_format]]
+      end
+      [:bypass_filtering, :no_fancy_upsampling, :use_threads].each do |key|
+        options_struct[key] = 1 if @user_options[key] && true == @user_options[key]
+      end
+      [: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
     
+    private
+
+    def encode_default(options_struct)
+      options_struct[:quality] = 100
+      similar_default(options_struct)
+    end
+    
+    def decode_default(options_struct)
+      # default format is png
+      options_struct[:output_format] = C::OutputFileFormat[:png]
+      similar_default(options_struct)
+    end
+    
+    def similar_default(options_struct)
+      options_struct[:crop_x] = options_struct[:crop_y] = 0
+      options_struct[:crop_w] = options_struct[:crop_h] = 0
+      options_struct[:resize_w] = options_struct[:resize_h] = 0
+    end
+
   end
 end

data/lib/webp/version.rb

@@ -1,3 +1,3 @@
 module WebP
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/webp/webp.rb

@@ -37,7 +37,9 @@ module WebP
     
     # decode
     def decode(input_file, output_file, options = {})
-      res = C.webp_decode(input_file, output_file)
+      options_obj = Options.new options
+      res = C.webp_decode(input_file, output_file, options_obj.decode_pointer)
+      raise DecoderError, DECODER_ERRORS[res - 1] unless 0 == res
       return true
     end
     

data/spec/webp_ffi_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe WebP do
   factories = {
-    webp: ["1", "2", "3", "4", "5", "6", "7"],
-    png: ["1", "2", "3", "4"],
-    jpg: ["5", "6"],
-    tiff: ["7"],
+    webp: ["1", "2", "3", "4", "5"],
+    png: ["1", "2"],
+    jpg: ["3", "4"],
+    tiff: ["5"],
     info: {
       "1" => {
         size: [400, 301],
@@ -16,22 +16,14 @@ describe WebP do
         has_alpha: true
       },
       "3" => {
-        size: [300, 300],
-        has_alpha: true
-      },
-      "4" => {
-        size: [2000, 2353],
-        has_alpha: true
-      },
-      "5" => {
         size: [550, 368],
         has_alpha: false
       },
-      "6" => {
+      "4" => {
         size: [1024, 772],
         has_alpha: false
       },
-      "7" => {
+      "5" => {
         size: [1419, 1001],
         has_alpha: false
       }
@@ -42,6 +34,12 @@ describe WebP do
     @out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
     Dir.mkdir(@out_dir) unless File.exists?(@out_dir)
   end
+  after :all do
+    @out_dir = File.expand_path(File.join(File.dirname(__FILE__), "../tmp/"))
+    #Dir["#{@out_dir}/*{.png,.webp}"].each do |file|
+    #  File.delete(file) rescue nil
+    #end
+  end
 
   it "calculate plus 100 by test_c (verify C)" do
     WebP::C.test_c(100).should == 200
@@ -105,24 +103,22 @@ describe WebP do
         expect { WebP.encode(in_filename, out_filename) }.to raise_error WebP::EncoderError
       end
     end
-  end
-  
-  context "encode with 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"))
-        WebP.encode(in_filename, out_filename, quality: 50)
+    context "with 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"))
+          WebP.encode(in_filename, out_filename, quality: 50, method: 0, alpha_quality: 10, alpha_compression: 1)
+        end
       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 { WebP.encode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebP::EncoderError
+    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}.invpng.webp"))
+          expect { WebP.encode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebP::EncoderError
+        end
       end
     end
   end
@@ -135,6 +131,49 @@ describe WebP do
         WebP.decode(in_filename, out_filename).should be_true
       end
     end
+    context "with output_format" do
+      [:png, :pam, :ppm, :pgm, :alpha_plane_only].each do |output_format|
+        factories[:webp].take(2).each do |image|
+          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
+          end
+        end
+      end
+    end
+    context "with options" do
+      factories[:webp].take(2).each do |image|
+        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
+        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
+        end
+      end
+    end
+    context "raise DecoderError on invalid webp image" 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}.invpng.webp"))
+          expect { WebP.decode(in_filename, out_filename) }.to raise_error WebP::DecoderError
+        end
+      end
+    end
+    context "raise DecoderError on invalid 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}.invpng.webp"))
+          expect { WebP.decode(in_filename, out_filename, crop_w: 30000) }.to raise_error WebP::DecoderError
+        end
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -124,16 +124,12 @@ files:
 - spec/factories/1.webp
 - spec/factories/2.png
 - spec/factories/2.webp
-- spec/factories/3.png
+- spec/factories/3.jpg
 - spec/factories/3.webp
-- spec/factories/4.png
+- spec/factories/4.jpg
 - spec/factories/4.webp
-- spec/factories/5.jpg
+- spec/factories/5.tif
 - spec/factories/5.webp
-- spec/factories/6.jpg
-- spec/factories/6.webp
-- spec/factories/7.tif
-- spec/factories/7.webp
 - spec/spec_helper.rb
 - spec/travis_build.sh
 - spec/webp_ffi_spec.rb
@@ -153,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2929211234645012291
+      hash: -2620577611088835367
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2929211234645012291
+      hash: -2620577611088835367
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -174,16 +170,12 @@ test_files:
 - spec/factories/1.webp
 - spec/factories/2.png
 - spec/factories/2.webp
-- spec/factories/3.png
+- spec/factories/3.jpg
 - spec/factories/3.webp
-- spec/factories/4.png
+- spec/factories/4.jpg
 - spec/factories/4.webp
-- spec/factories/5.jpg
+- spec/factories/5.tif
 - spec/factories/5.webp
-- spec/factories/6.jpg
-- spec/factories/6.webp
-- spec/factories/7.tif
-- spec/factories/7.webp
 - spec/spec_helper.rb
 - spec/travis_build.sh
 - spec/webp_ffi_spec.rb