webp-ffi 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2369fa3ab99b3d494db9eeeb7f19c340c940d91d
-  data.tar.gz: 58ebaf382e3b9159ccb01f9d780b76a9be55d11f
+  metadata.gz: 5dc135cb052630588802ca113f8d11a18ccd0dfe
+  data.tar.gz: 685b69ef56c9d2928ab5a6c2f1631f5675bb5796
 SHA512:
-  metadata.gz: feb10c1edaaab6101c969dc8ea38324dae4e9a5268d71f994abb8dff878b1ce2c54553a19100bbf982d5b59ad99c6f692c974b3a5345fa03fae369dd067d4794
-  data.tar.gz: 002dda47a905f3f2e2dfd85b310eacd7771df366eeb663c0754ba10a9b54f3fb351768b46b8195799ea1b07da670c2a1a45a343030774bb80b80c9727410c5cc
+  metadata.gz: 4b38a77daf24a59aebe807b2444f2a8c601392f78d1d4bdac3363887268ecd2f647577c66bad6847b9dd4ebc147d53c81b5724da042107b4ec1712a427a39edc
+  data.tar.gz: 56a5f00d3cc2b4719060d5e6b03684754d34451cab57a05ce2f476153631f386fd61ce39877f722e3e1ddf68eaf938eec8102672e307dee823ecd1bbbb9a6532

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.2.3
+
+* Fix jpg read in C code
+
 ## v0.2.2
 
 * Fix png lossless

data/ext/webp_ffi/util.c

@@ -63,10 +63,9 @@ static int UtilReadJPEG(FILE* in_file, WebPPicture* const pic) {
   int ok = 0;
   int stride, width, height;
   uint8_t* rgb = NULL;
-  uint8_t* row_ptr = NULL;
   struct jpeg_decompress_struct dinfo;
   struct my_error_mgr jerr;
-  JSAMPARRAY buffer;
+  JSAMPROW buffer[1];
 
   dinfo.err = jpeg_std_error(&jerr.pub);
   jerr.pub.error_exit = my_error_exit;
@@ -82,7 +81,6 @@ static int UtilReadJPEG(FILE* in_file, WebPPicture* const pic) {
   jpeg_read_header(&dinfo, TRUE);
 
   dinfo.out_color_space = JCS_RGB;
-  dinfo.dct_method = JDCT_IFAST;
   dinfo.do_fancy_upsampling = TRUE;
 
   jpeg_start_decompress(&dinfo);
@@ -99,20 +97,13 @@ static int UtilReadJPEG(FILE* in_file, WebPPicture* const pic) {
   if (rgb == NULL) {
     goto End;
   }
-  row_ptr = rgb;
-
-  buffer = (*dinfo.mem->alloc_sarray) ((j_common_ptr) &dinfo,
-                                       JPOOL_IMAGE, stride, 1);
-  if (buffer == NULL) {
-    goto End;
-  }
+  buffer[0] = (JSAMPLE*)rgb;
 
   while (dinfo.output_scanline < dinfo.output_height) {
     if (jpeg_read_scanlines(&dinfo, buffer, 1) != 1) {
       goto End;
     }
-    memcpy(row_ptr, buffer[0], stride);
-    row_ptr += stride;
+    buffer[0] += stride;
   }
 
   jpeg_finish_decompress(&dinfo);
@@ -122,11 +113,10 @@ static int UtilReadJPEG(FILE* in_file, WebPPicture* const pic) {
   pic->width = width;
   pic->height = height;
   ok = WebPPictureImportRGB(pic, rgb, stride);
+  if (!ok) goto Error;
 
  End:
-  if (rgb) {
-    free(rgb);
-  }
+  free(rgb);
   return ok;
 }
 

data/lib/webp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webp-ffi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alexey Vasyliev