libjpeg-ruby 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd107f31f10ef4251f056cfc06e2c16082b1d5e42b98a6b810385a171f92991
-  data.tar.gz: eef3261d6619e567a5b063ccd5c72468ab975b4fc80d693ebe49bc3531c76139
+  metadata.gz: 3523da7ee57f41d57b81fe97558564e0b0459c5977321ba88a298a450cd9273a
+  data.tar.gz: 103f379375f273f0f9a77109cc3dff8018779ce94837d2182e1e0ce50bb78213
 SHA512:
-  metadata.gz: c8d4ce1bd5e96f70f26cc167282f1761c5085c0eb901df9c5b948d2ce6bd9aac8cb3006e4d17a28bbed1a7d6ef597dcbbb028529075839aca992ce2e5dd5e55a
-  data.tar.gz: 4e4f0fc6e9a9ec579e50ad00f6f5558caf1753f689e1a5aea8fe7fe11bb188863cbd77f1706591a14532d77be92316b2eb16b912a835ac80bf18ae74952deb57
+  metadata.gz: fd38c818582812ce2ef404ade310846a5af944e2b05c2b16df4df66bf62dd3404c9c68c6508e65e8a603041ab6f0d21484d911680e967f7e11aa9ad94a7d2782
+  data.tar.gz: a05940b338d1660f90345c7eebdeea897629ac37c33949720cde9d4c4d5794eb73dcb0f1be568d078110185ffe223425e4f5cb61da10f3075dd63a6c1a1fe185

data/ext/jpeg/jpeg.c

@@ -33,7 +33,6 @@
 #define F_APPLY_ORIENTATION        0x00000008
 #define F_DITHER                   0x00000010
 #define F_CREAT                    0x00010000
-#define F_START                    0x00020000
 
 #define SET_FLAG(ptr, msk)         ((ptr)->flags |= (msk))
 #define CLR_FLAG(ptr, msk)         ((ptr)->flags &= ~(msk))
@@ -69,8 +68,8 @@
 #define IS_COLORMAPPED(ci)         (((ci)->actual_number_of_colors > 0) &&\
                                     ((ci)->colormap != NULL) && \
                                     ((ci)->output_components == 1) && \
-                                       (((ci)->out_color_components == 1) || \
-                                        ((ci)->out_color_components == 3)))
+                                    (((ci)->out_color_components == 1) || \
+                                     ((ci)->out_color_components == 3)))
 
 #define ALLOC_ARRAY() \
         ((JSAMPARRAY)malloc(sizeof(JSAMPROW) * UNIT_LINES))
@@ -1217,6 +1216,7 @@ do_encode(VALUE _ptr)
     /*
      * when error occurred
      */
+    jpeg_abort_compress(&ptr->cinfo);
     rb_raise(encerr_klass, "%s", ptr->err_mgr.msg);
 
   } else {
@@ -1224,7 +1224,6 @@ do_encode(VALUE _ptr)
      * normal path
      */
     jpeg_start_compress(&ptr->cinfo, TRUE);
-    SET_FLAG(ptr, F_START);
 
     if (ptr->orientation != 0) {
       put_exif_tags(ptr);
@@ -1240,6 +1239,8 @@ do_encode(VALUE _ptr)
       data += (ptr->stride * nrow);
     }
 
+    jpeg_finish_compress(&ptr->cinfo);
+
     /*
      * build return data
      */
@@ -1310,11 +1311,6 @@ rb_encoder_encode(VALUE self, VALUE data)
   /*
    * post process
    */
-  if (TEST_FLAG(ptr, F_START)) {
-    jpeg_finish_compress(&ptr->cinfo);
-    CLR_FLAG(ptr, F_START);
-  }
-
   CLR_DATA(ptr);
 
   if (ptr->buf.mem != NULL) {
@@ -3548,11 +3544,12 @@ do_decode(VALUE _ptr)
     /*
      * when error occurred
      */
+    jpeg_abort_decompress(&ptr->cinfo);
     rb_raise(decerr_klass, "%s", ptr->err_mgr.msg);
 
   } else {
     /*
-     * normal path
+     * initialize
      */
     jpeg_mem_src(cinfo, data, size);
 
@@ -3563,6 +3560,9 @@ do_decode(VALUE _ptr)
     jpeg_read_header(cinfo, TRUE);
     jpeg_calc_output_dimensions(cinfo);
 
+    /*
+     * configuration
+     */
     cinfo->raw_data_out             = FALSE;
     cinfo->dct_method               = ptr->dct_method;
            
@@ -3581,8 +3581,10 @@ do_decode(VALUE _ptr)
     cinfo->enable_external_quant    = ptr->enable_external_quant;
     cinfo->enable_2pass_quant       = ptr->enable_2pass_quant;
 
+    /*
+     * decode process
+     */
     jpeg_start_decompress(cinfo);
-    SET_FLAG(ptr, F_START);
 
     stride = cinfo->output_components * cinfo->output_width;
     raw_sz = stride * cinfo->output_height;
@@ -3597,6 +3599,11 @@ do_decode(VALUE _ptr)
       jpeg_read_scanlines(cinfo, array, UNIT_LINES);
     }
 
+    jpeg_finish_decompress(&ptr->cinfo);
+
+    /*
+     * build return data
+     */
     if (TEST_FLAG(ptr, F_EXPAND_COLORMAP) && IS_COLORMAPPED(cinfo)) {
       ret = expand_colormap(cinfo, raw);
     } else {
@@ -3658,16 +3665,6 @@ rb_decoder_decode(VALUE self, VALUE data)
   /*
    * post process
    */
-  if (TEST_FLAG(ptr, F_START)) {
-    if (state == 0) {
-      jpeg_finish_decompress(&ptr->cinfo);
-    } else {
-      jpeg_abort_decompress(&ptr->cinfo);
-    }
-
-    CLR_FLAG(ptr, F_START);
-  }
-
   CLR_DATA(ptr);
 
   if (state != 0) rb_jump_tag(state);

data/lib/jpeg/version.rb

@@ -1,3 +1,3 @@
 module JPEG
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libjpeg-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Hiroshi Kuwagata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler