jpeg 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e34eced4b72b29ce0b8db024cb09d9129923db
-  data.tar.gz: f6037f904afb7807dab5373ce124bb6e3bd18a6e
+  metadata.gz: 5d53a185f8b43438f663a8e6515c32e76913c618
+  data.tar.gz: 1ae8dc89c3d59e39daa72326ec5d1baabb0545c0
 SHA512:
-  metadata.gz: 36106ee53ebf35042fc721ef305ab5d4f9dcb16a2a1ae63957e11207d7e3ba408b475b8edb6469e8cacb9c43e6644f61514bbd674badb52593b8f814ed8a5064
-  data.tar.gz: 98719b20b28f9f1f4043169d11a45d96c8bdde5437eecd429064f8db2ec8808822d6eea043f9f8310d198d792b2710de2c76a5962b8c00233ed5315b625354c8
+  metadata.gz: 293cb450233a0c2b2d0a5b915031853f0633ce95ac8f21d5f65fad003489ce214af197a7b3bc48eff4d06e70164f3d3152e4b5fe5deacb92e0a47447445bba10
+  data.tar.gz: 8dd0300b215a2094ac3b4f812ec09a1d0671b313b99eb658ce11d7c3ca5909bc4ea165178ec5139085d38a49118cc0f758fac5f998e38bcce34676bf77fd0c59

data/.travis.yml

@@ -3,4 +3,4 @@ before_script:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.3
+  - 2.1.5

data/ext/jpeg/jpeg_image.c

@@ -14,6 +14,7 @@ static VALUE jpeg_image_width(VALUE self);
 static VALUE jpeg_image_height(VALUE self);
 static VALUE jpeg_image_size(VALUE self);
 static VALUE jpeg_image_color_info(VALUE self);
+static VALUE jpeg_image_raw_data(VALUE self);
 
 extern VALUE rb_eJpegError;
 
@@ -25,17 +26,19 @@ void Init_jpeg_image(void) {
     rb_define_method(rb_cJpegImage, "height", jpeg_image_height, 0);
     rb_define_method(rb_cJpegImage, "size", jpeg_image_size, 0);
     rb_define_method(rb_cJpegImage, "color_info", jpeg_image_color_info, 0);
+    rb_define_method(rb_cJpegImage, "raw_data", jpeg_image_raw_data, 0);
 }
 
 void jpeg_image_exit(j_common_ptr jpeg) {
     char buffer[JMSG_LENGTH_MAX];
     jpeg->err->format_message(jpeg, buffer);
-    rb_raise(rb_eJpegError, buffer);
+    rb_raise(rb_eJpegError, "%s", buffer);
 }
 
 static VALUE jpeg_image_alloc(VALUE klass) {
     struct rb_jpeg_image *jpeg = ALLOC(struct rb_jpeg_image);
 
+    jpeg->fp = NULL;
     jpeg->read = (void *)ALLOC(struct jpeg_decompress_struct);
     jpeg->error = (void *)ALLOC(struct jpeg_error_mgr);
     jpeg->read->err = jpeg_std_error(jpeg->error);
@@ -57,6 +60,9 @@ static void jpeg_image_free(struct rb_jpeg_image *p) {
     if (p->error) {
         xfree(p->error);
     }
+    if (p->fp) {
+        fclose(p->fp);
+    }
     xfree(p);
 }
 
@@ -64,7 +70,6 @@ static VALUE jpeg_image_s_open(int argc, VALUE *argv, VALUE self) {
     VALUE path;
     VALUE jpeg;
     struct rb_jpeg_image *p_jpeg;
-    FILE *fp;
     char *filename;
     rb_scan_args(argc, argv, "1", &path);
     Check_Type(path, T_STRING);
@@ -73,27 +78,25 @@ static VALUE jpeg_image_s_open(int argc, VALUE *argv, VALUE self) {
     Data_Get_Struct(jpeg, struct rb_jpeg_image, p_jpeg);
     filename = StringValuePtr(path);
 
-    if ((fp = fopen(filename, "rb")) == NULL) {
+    if ((p_jpeg->fp = fopen(filename, "rb")) == NULL) {
         rb_raise(rb_eJpegError, "Open file failed: %s", filename);
     }
-    jpeg_stdio_src(p_jpeg->read, fp);
+    jpeg_stdio_src(p_jpeg->read, p_jpeg->fp);
 
     jpeg_read_header(p_jpeg->read, TRUE);
-    jpeg_start_decompress(p_jpeg->read);
-    fclose(fp);
     return jpeg;
 }
 
 static VALUE jpeg_image_width(VALUE self) {
     struct rb_jpeg_image *p_jpeg;
     Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
-    return rb_int_new(p_jpeg->read->output_width);
+    return rb_int_new(p_jpeg->read->image_width);
 }
 
 static VALUE jpeg_image_height(VALUE self) {
     struct rb_jpeg_image *p_jpeg;
     Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
-    return rb_int_new(p_jpeg->read->output_height);
+    return rb_int_new(p_jpeg->read->image_height);
 }
 
 static VALUE jpeg_image_size(VALUE self) {
@@ -102,8 +105,8 @@ static VALUE jpeg_image_size(VALUE self) {
     Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
 
     array = rb_ary_new();
-    rb_ary_push(array, rb_int_new(p_jpeg->read->output_width));
-    rb_ary_push(array, rb_int_new(p_jpeg->read->output_height));
+    rb_ary_push(array, rb_int_new(p_jpeg->read->image_width));
+    rb_ary_push(array, rb_int_new(p_jpeg->read->image_height));
 
     return array;
 }
@@ -112,5 +115,57 @@ static VALUE jpeg_image_color_info(VALUE self) {
     struct rb_jpeg_image *p_jpeg;
 
     Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
-    return ID2SYM(rb_intern( p_jpeg->read->out_color_components == 3 ? "rgb" : "gray" ));
+    return ID2SYM(rb_intern( p_jpeg->read->out_color_space == JCS_GRAYSCALE ? "gray" : "rgb" ));
+}
+
+static VALUE jpeg_image_raw_data(VALUE self) {
+    struct rb_jpeg_image *p_jpeg;
+    VALUE matrix;
+    VALUE line;
+    VALUE point;
+    int64_t line_size;
+    int64_t i;
+    JSAMPARRAY buffer;
+
+    matrix = rb_iv_get(self, "@raw_data");
+
+    if (RTEST(matrix)) {
+        return matrix;
+    }
+
+    Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
+
+    jpeg_start_decompress(p_jpeg->read);
+
+    line_size = p_jpeg->read->output_width * p_jpeg->read->out_color_components;
+    if ((buffer = (*p_jpeg->read->mem->alloc_sarray)((j_common_ptr) p_jpeg->read, JPOOL_IMAGE, line_size, 1)) == NULL) {
+        rb_raise(rb_eJpegError, "Could not allocate memory (%ld bytes) to decode the image", line_size);
+    }
+
+    matrix = rb_ary_new();
+    while (p_jpeg->read->output_scanline < p_jpeg->read->output_height) {
+        jpeg_read_scanlines(p_jpeg->read, buffer , 1);
+
+        line = rb_ary_new();
+        if (p_jpeg->read->out_color_components == 3) {
+            for (i = 0; i < line_size; i += 3) {
+                point = rb_ary_new();
+                rb_ary_push(point, rb_int_new(buffer[0][i]));
+                rb_ary_push(point, rb_int_new(buffer[0][i + 1]));
+                rb_ary_push(point, rb_int_new(buffer[0][i + 2]));
+                rb_ary_push(line, point);
+            }
+        } else {
+            for (i = 0; i < line_size; i++) {
+                rb_ary_push(line, rb_int_new(buffer[0][i]));
+            }
+        }
+
+        rb_ary_push(matrix, line);
+    }
+    jpeg_finish_decompress(p_jpeg->read);
+
+    rb_iv_set(self, "@raw_data", matrix);
+
+    return matrix;
 }

data/ext/jpeg/jpeg_image.h

@@ -7,6 +7,7 @@
 struct rb_jpeg_image {
     struct jpeg_decompress_struct *read;
     struct jpeg_error_mgr *error;
+    FILE *fp;
 };
 
 void Init_jpeg_image();

data/lib/jpeg/version.rb

@@ -1,3 +1,3 @@
 module Jpeg
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/spec/jpeg_spec.rb

@@ -16,6 +16,14 @@ describe "Jpeg" do
       it { expect(subject.color_info).to eq :rgb }
       it { expect(subject).to be_rgb }
       it { expect(subject).not_to be_gray }
+      it "should export the decoded data" do
+        decoded = subject.raw_data
+        expect(decoded.count).to eq 112
+        expect(decoded[0].count).to eq 112
+        expect(decoded[0][0]).to eq [255, 255, 253]
+        expect(decoded[60][50]).to eq [16, 27, 207]
+        expect(decoded[111][111]).to eq [255, 255, 255]
+      end
     end
 
     context "non-exists file" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpeg
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler