libjpeg-ruby 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca94a8b3e9236b03b8ec0ca9f9b30837a6f3cb0c7014f9e48b169601a701fc44
-  data.tar.gz: cefa3b898236cc01e540ca6003cfa6792c39acf4b5793bf438dd47b6f8c23b75
+  metadata.gz: 29398bd546766eb9b4c660c7e9b71910debbfc065e2a6e66377b4448cd73d7ae
+  data.tar.gz: 4e1e5521b1c2ad8dd45b47bca048eb446e72ef7d76a84e97ea36929a9cbbbddb
 SHA512:
-  metadata.gz: f3b89c866bdc6fbe311d40b221e67c718068f9920e1db3b33a728478a79910808ce0b25f1a81628d7590d2f907d57572ddd91068b3e07330c562d34cab66e5be
-  data.tar.gz: b41ac45a2640e54bf341a8bb684d7740c8d17cdf25bdbeb1bce369bbc9d4a13dd29c570486cbbf72ea6ff5300fdfe0ba237ce1a6175a6d5da02c39b582a65d9c
+  metadata.gz: a8140f6bf923073df861bf86d70c37e45360c8b34af33b5bab448e4564d3184b438597689d5276bc5d4a7956caef05d33d3525495e7fe6a136ab3d74c7024a14
+  data.tar.gz: 84efbe3208cb7ce49afd0000fe8814944f7c81fb19c490567436f201953a61a7f3f0245c18c11d8b7ec2d8b7bd3edd53ba181ecbc4b98a5e8155d7003979dcab

data/README.md

@@ -1,2 +1,74 @@
 # libjpeg-ruby
 libjpeg interface for ruby.
+
+## Installation
+
+```ruby
+gem 'libjpeg-ruby'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install libjpeg-ruby
+
+## Usage
+
+### decode sample
+
+```ruby
+require 'jpeg'
+
+dec = JPEG::Decoder.new(:pixel_format => :BGR)
+
+p dec.read_header(IO.binread("test.jpg")
+
+raw = dec << IO.binread("test.jpg")
+p raw.meta
+
+IO.binwrite("test.bgr", raw)
+```
+
+#### decode options
+| option | value type | description |
+|---|---|---|
+| :pixel_format | String or Symbol | output format |
+| :output_gamma | Float | gamma value |
+| :fancy_upsampling | Boolean | T.B.D |
+| :do_smoothing | Boolean | T.B.D |
+| :opt_dither | [{str}MODE, {bool}2PASS, {int}NUM_COLORS] | T.B.D |
+| :use_1ass_quantizer | Boolean | T.B.D |
+| :use_external_colormap | Boolean | T.B.D |
+| :use_2pass_quantizer | Boolean | T.B.D |
+| :without_meta | Boolean | T.B.D |
+| :expand_colormap | Booblean | T.B.D |
+| :scale | Rational or Float | T.B.D |
+| :dct_method | String or Symbol | T.B.D |
+
+#### supported output format
+RGB RGB24 YUV422 YUYV RGB565 YUV444 YCbCr BGR BGR24 RGBX RGB32 BGRX BGR32 
+
+#### supported DCT method
+ISLOW IFAST FLOAT FASTEST
+
+### encode sample
+
+```ruby
+require 'jpeg'
+
+enc = JPEG::Encoder.new(640, 480, :pixel_format => :YCbCr)
+
+IO.binwrite("test.jpg", enc << IO.binread("test.raw"))
+```
+#### encode option
+#### encode options
+| option | value type | description |
+|---|---|---|
+| :pixel_fromat | String or Symbol | input format |
+| :quality | Integer | encode quality (0-100) |
+| :scale | Rational or Float | |
+| :dct_method | String or Symbol | T.B.D |
+

data/ext/jpeg/jpeg.c

@@ -82,6 +82,7 @@ static const char* encoder_opts_keys[] = {
   "pixel_format",             // {str}
   "quality",                  // {integer}
   "scale",                    // {rational} or {float}
+  "dct_method"                // {str}
 };
 
 static ID encoder_opts_ids[N(encoder_opts_keys)];
@@ -92,6 +93,7 @@ typedef struct {
   int height;
 
   int data_size;
+  J_DCT_METHOD dct_method;
 
   struct jpeg_compress_struct cinfo;
   struct jpeg_error_mgr jerr;
@@ -112,6 +114,7 @@ static const char* decoder_opts_keys[] = {
   "without_meta",             // {bool}
   "expand_colormap",          // {bool}
   "scale",                    // {rational} or {float}
+  "dct_method"                // {str}
 };
 
 static ID decoder_opts_ids[N(decoder_opts_keys)];
@@ -138,6 +141,7 @@ typedef struct {
   boolean do_block_smoothing;
   boolean quantize_colors;
   J_DITHER_MODE dither_mode;
+  J_DCT_METHOD dct_method;
   boolean two_pass_quantize;
   int desired_number_of_colors;
   boolean enable_1pass_quant;
@@ -191,6 +195,8 @@ rb_encoder_alloc(VALUE self)
   ptr = ALLOC(jpeg_encode_t);
   memset(ptr, 0, sizeof(*ptr));
 
+  ptr->dct_method = JDCT_FASTEST;
+
   return Data_Wrap_Struct(encoder_klass, 0, rb_encoder_free, ptr);
 }
 
@@ -314,6 +320,24 @@ set_encoder_context(jpeg_encode_t* ptr, int wd, int ht, VALUE opt)
     break;
   }
 
+  /*
+   * eval dct_method option
+   */
+  if (opts[3] == Qundef || EQ_STR(opts[3], "FASTEST")) {
+    ptr->dct_method = JDCT_FASTEST;
+
+  } else if (EQ_STR(opts[3], "ISLOW")) {
+    ptr->dct_method = JDCT_ISLOW;
+
+  } else if (EQ_STR(opts[3], "IFAST")) {
+    ptr->dct_method = JDCT_IFAST;
+
+  } else if (EQ_STR(opts[3], "FLOAT")) {
+    ptr->dct_method = JDCT_FLOAT;
+
+  } else {
+    ARGUMENT_ERROR("Unsupportd :dct_method option value.");
+  }
 
   /*
    * set context
@@ -343,7 +367,7 @@ set_encoder_context(jpeg_encode_t* ptr, int wd, int ht, VALUE opt)
   ptr->cinfo.optimize_coding  = TRUE;
   ptr->cinfo.arith_code       = TRUE;
   ptr->cinfo.raw_data_in      = FALSE;
-  ptr->cinfo.dct_method       = JDCT_FASTEST;
+  ptr->cinfo.dct_method       = ptr->dct_method;
 
   jpeg_set_defaults(&ptr->cinfo);
   jpeg_set_quality(&ptr->cinfo, quality, TRUE);
@@ -642,6 +666,7 @@ rb_decoder_alloc(VALUE self)
   ptr->do_block_smoothing       = FALSE;
   ptr->quantize_colors          = FALSE;
   ptr->dither_mode              = JDITHER_NONE;
+  ptr->dct_method               = JDCT_FASTEST;
   ptr->desired_number_of_colors = 0;
   ptr->enable_1pass_quant       = FALSE;
   ptr->enable_external_quant    = FALSE;
@@ -969,6 +994,28 @@ eval_decoder_opt_scale(jpeg_decode_t* ptr, VALUE opt)
   }
 }
 
+static void
+eval_decoder_opt_dct_method(jpeg_decode_t* ptr, VALUE opt)
+{
+  if (opt != Qundef) {
+    if (EQ_STR(opt, "ISLOW")) {
+      ptr->dct_method = JDCT_ISLOW;
+
+    } else if (EQ_STR(opt, "IFAST")) {
+      ptr->dct_method = JDCT_IFAST;
+
+    } else if (EQ_STR(opt, "FLOAT")) {
+      ptr->dct_method = JDCT_FLOAT;
+
+    } else if (EQ_STR(opt, "FASTEST")) {
+      ptr->dct_method = JDCT_FASTEST;
+
+    } else {
+      ARGUMENT_ERROR("Unsupportd :dct_method option value.");
+    }
+  }
+}
+
 static void
 set_decoder_context( jpeg_decode_t* ptr, VALUE opt)
 {
@@ -990,11 +1037,10 @@ set_decoder_context( jpeg_decode_t* ptr, VALUE opt)
   eval_decoder_opt_use_1pass_quantizer(ptr, opts[5]);
   eval_decoder_opt_use_external_colormap(ptr, opts[6]);
   eval_decoder_opt_use_2pass_quantizer(ptr, opts[7]);
-
   eval_decoder_opt_without_meta(ptr, opts[8]);
   eval_decoder_opt_expand_colormap(ptr, opts[9]);
-
   eval_decoder_opt_scale(ptr, opts[10]);
+  eval_decoder_opt_dct_method(ptr, opts[11]);
 }
 
 static VALUE
@@ -1336,7 +1382,7 @@ do_decode(jpeg_decode_t* ptr, uint8_t* jpg, size_t jpg_sz)
       jpeg_read_header(cinfo, TRUE);
 
       cinfo->raw_data_out              = FALSE;
-      cinfo->dct_method                = JDCT_FLOAT;
+      cinfo->dct_method                = ptr->dct_method;
 
       cinfo->out_color_space           = ptr->out_color_space;
       cinfo->out_color_components      = ptr->out_color_components;

data/lib/jpeg/version.rb

@@ -1,3 +1,3 @@
 module JPEG
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/libjpeg-ruby.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/jpeg/extconf.rb"]
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.4.0"
+
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libjpeg-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Hiroshi Kuwagata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="