webp-ffi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7745e9bcd09baff6c5ffe977eaf00e2ff078a628
-  data.tar.gz: b948b1fa7ac70829b4ec1a95a19072aec525165f
+  metadata.gz: 2369fa3ab99b3d494db9eeeb7f19c340c940d91d
+  data.tar.gz: 58ebaf382e3b9159ccb01f9d780b76a9be55d11f
 SHA512:
-  metadata.gz: 249cff2c45f5e988acedff8bd63226f8ad3ab845e97919281a4774b608ae17c16ba5451b3f8702de1bac5554c7bdfaf32ab82e69839ed92f96cb32a4223a1702
-  data.tar.gz: 17e4db3fd151581ade623b92d406f0c4477d4c0980255897ea8e9be660bad97562f8fa6952e2937e42029d58f03c0f79c11d559adf4666cbc02f3f95d29932c9
+  metadata.gz: feb10c1edaaab6101c969dc8ea38324dae4e9a5268d71f994abb8dff878b1ce2c54553a19100bbf982d5b59ad99c6f692c974b3a5345fa03fae369dd067d4794
+  data.tar.gz: 002dda47a905f3f2e2dfd85b310eacd7771df366eeb663c0754ba10a9b54f3fb351768b46b8195799ea1b07da670c2a1a45a343030774bb80b80c9727410c5cc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.2.2
+
+* Fix png lossless
+
 ## v0.2.1
 
 * Fix output for bmp, tiff and yuv

data/README.md

@@ -116,13 +116,16 @@ Decode webp image (default format is png):
     WebP.decode(filename, out_filename)
 
 
-Decode webp image to pam, ppm or pgm format of image:
+Decode webp image to pam, ppm, pgm, bmp, tiff or yuv 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)
+    WebP.decode(filename, out_filename, output_format: :bmp)
+    WebP.decode(filename, out_filename, output_format: :tiff)
+    WebP.decode(filename, out_filename, output_format: :yuv)
 
 
 Decode webp image with options:

data/ext/webp_ffi/util.c

@@ -137,7 +137,8 @@ static void PNGAPI error_function(png_structp png, png_const_charp dummy) {
 
 static int UtilReadPNG(FILE* in_file, WebPPicture* const pic, int keep_alpha) {
   png_structp png;
-  png_infop info;
+  png_infop info = NULL;
+  png_infop end_info = NULL;
   int color_type, bit_depth, interlaced;
   int has_alpha;
   int num_passes;
@@ -155,13 +156,14 @@ static int UtilReadPNG(FILE* in_file, WebPPicture* const pic, int keep_alpha) {
   png_set_error_fn(png, 0, error_function, NULL);
   if (setjmp(png_jmpbuf(png))) {
  Error:
-    png_destroy_read_struct(&png, NULL, NULL);
-    free(rgb);
+    png_destroy_read_struct(&png, &info, &end_info);
     goto End;
   }
 
   info = png_create_info_struct(png);
   if (info == NULL) goto Error;
+  end_info = png_create_info_struct(png);
+  if (end_info == NULL) goto Error;
 
   png_init_io(png, in_file);
   png_read_info(png, info);
@@ -202,20 +204,21 @@ static int UtilReadPNG(FILE* in_file, WebPPicture* const pic, int keep_alpha) {
       png_read_rows(png, &row, NULL, 1);
     }
   }
-  png_read_end(png, info);
-  png_destroy_read_struct(&png, &info, NULL);
+  png_read_end(png, end_info);
+  png_destroy_read_struct(&png, &info, &end_info);
 
   pic->width = width;
   pic->height = height;
+  pic->use_argb = 1;
   ok = has_alpha ? WebPPictureImportRGBA(pic, rgb, stride)
                  : WebPPictureImportRGB(pic, rgb, stride);
-  free(rgb);
 
-  if (ok && has_alpha && keep_alpha == 2) {
-    WebPCleanupTransparentArea(pic);
+  if (!ok) {
+    goto Error;
   }
 
  End:
+  free(rgb);
   return ok;
 }
 

data/lib/webp/version.rb

@@ -1,3 +1,3 @@
 module WebP
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alexey Vasyliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi