jpeg 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d53a185f8b43438f663a8e6515c32e76913c618
-  data.tar.gz: 1ae8dc89c3d59e39daa72326ec5d1baabb0545c0
+  metadata.gz: 2b512a8178edabb2a12690e9a276ad5606e0a80b
+  data.tar.gz: aaba7c6ba93a72a70523022f8ec9755520773172
 SHA512:
-  metadata.gz: 293cb450233a0c2b2d0a5b915031853f0633ce95ac8f21d5f65fad003489ce214af197a7b3bc48eff4d06e70164f3d3152e4b5fe5deacb92e0a47447445bba10
-  data.tar.gz: 8dd0300b215a2094ac3b4f812ec09a1d0671b313b99eb658ce11d7c3ca5909bc4ea165178ec5139085d38a49118cc0f758fac5f998e38bcce34676bf77fd0c59
+  metadata.gz: d161cfb5425cd64037ae7f264e374a97a1a232dfc9215cb36f65b26c29601e5e5e713c88813b9594c72db7dda9f934e33e81f0807c7da854d8fe604046e5cfc6
+  data.tar.gz: 25122f30d0b14743f57007162fc4c223e507f2f257120c3d36cc55d7ba4b4b65160e90bd5f215ae790281ab5843de58b7c9937ace6b46102052f3b9d033af697

data/ext/jpeg/jpeg_image.c

@@ -7,13 +7,11 @@ extern VALUE rb_mJpeg;
 VALUE rb_cJpegImage;
 
 static VALUE jpeg_image_s_open(int argc, VALUE *argv, VALUE sef);
+static VALUE jpeg_image_s_open_buffer(int argc, VALUE *argv, VALUE sef);
 static VALUE jpeg_image_alloc(VALUE klass);
 static void jpeg_image_mark(struct rb_jpeg_image *p);
 static void jpeg_image_free(struct rb_jpeg_image *p);
-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;
@@ -22,10 +20,12 @@ void Init_jpeg_image(void) {
     rb_cJpegImage = rb_define_class_under(rb_mJpeg, "Image", rb_cObject);
     rb_define_alloc_func(rb_cJpegImage, jpeg_image_alloc);
     rb_define_singleton_method(rb_cJpegImage, "open", jpeg_image_s_open, -1);
-    rb_define_method(rb_cJpegImage, "width", jpeg_image_width, 0);
-    rb_define_method(rb_cJpegImage, "height", jpeg_image_height, 0);
+    rb_define_singleton_method(rb_cJpegImage, "open_buffer", jpeg_image_s_open_buffer, -1);
+    rb_attr(rb_cJpegImage, rb_intern("width"), 1, 0, 0);
+    rb_attr(rb_cJpegImage, rb_intern("height"), 1, 0, 0);
+    rb_attr(rb_cJpegImage, rb_intern("color_info"), 1, 0, 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);
 }
 
@@ -43,7 +43,6 @@ static VALUE jpeg_image_alloc(VALUE klass) {
     jpeg->error = (void *)ALLOC(struct jpeg_error_mgr);
     jpeg->read->err = jpeg_std_error(jpeg->error);
     jpeg->error->error_exit = jpeg_image_exit;
-    jpeg_create_decompress(jpeg->read);
 
     return Data_Wrap_Struct(klass, jpeg_image_mark, jpeg_image_free, jpeg);
 }
@@ -54,7 +53,6 @@ static void jpeg_image_mark(struct rb_jpeg_image *p) {
 
 static void jpeg_image_free(struct rb_jpeg_image *p) {
     if (p->read) {
-        jpeg_destroy_decompress(p->read);
         xfree(p->read);
     }
     if (p->error) {
@@ -66,56 +64,91 @@ static void jpeg_image_free(struct rb_jpeg_image *p) {
     xfree(p);
 }
 
-static VALUE jpeg_image_s_open(int argc, VALUE *argv, VALUE self) {
-    VALUE path;
+static void jpeg_image_s_set_read_source(struct rb_jpeg_image *p_jpeg) {
+
+    if (p_jpeg->filename) {
+
+        if ((p_jpeg->fp = fopen(p_jpeg->filename, "rb")) == NULL) {
+            rb_raise(rb_eJpegError, "Open file failed: %s", p_jpeg->filename);
+        }
+
+    } else {
+
+#ifdef jpeg_mem_src
+        jpeg_mem_src(p_jpeg->read, (unsigned char *) p_jpeg->buffer, p_jpeg->buffer_len);
+#else
+        if ((p_jpeg->fp = fmemopen(p_jpeg->buffer, p_jpeg->buffer_len, "rb")) == NULL) {
+            rb_raise(rb_eJpegError, "Could not read jpeg from buffer");
+        }
+#endif
+
+    }
+
+    if (p_jpeg->fp) {
+        jpeg_stdio_src(p_jpeg->read, p_jpeg->fp);
+    }
+}
+
+static VALUE jpeg_image_s_get_image_values(char *filename, char *buffer, int64_t buffer_len, VALUE self) {
     VALUE jpeg;
     struct rb_jpeg_image *p_jpeg;
-    char *filename;
-    rb_scan_args(argc, argv, "1", &path);
-    Check_Type(path, T_STRING);
 
-    jpeg = rb_funcall(rb_cJpegImage, rb_intern("new"), 0);
+    jpeg = rb_obj_alloc(rb_cJpegImage);
+    rb_obj_call_init(jpeg, 0, NULL);
+
     Data_Get_Struct(jpeg, struct rb_jpeg_image, p_jpeg);
-    filename = StringValuePtr(path);
 
-    if ((p_jpeg->fp = fopen(filename, "rb")) == NULL) {
-        rb_raise(rb_eJpegError, "Open file failed: %s", filename);
-    }
-    jpeg_stdio_src(p_jpeg->read, p_jpeg->fp);
+    p_jpeg->filename = filename;
+    p_jpeg->buffer = buffer;
+    p_jpeg->buffer_len = buffer_len;
+
+    jpeg_create_decompress(p_jpeg->read);
+
+    jpeg_image_s_set_read_source(p_jpeg);
 
     jpeg_read_header(p_jpeg->read, TRUE);
+
+    rb_iv_set(jpeg, "@width", LONG2NUM(p_jpeg->read->image_width));
+    rb_iv_set(jpeg, "@height", LONG2NUM(p_jpeg->read->image_height));
+    rb_iv_set(jpeg, "@color_info", ID2SYM(rb_intern( p_jpeg->read->out_color_space == JCS_GRAYSCALE ? "gray" : "rgb" )));
+
+    jpeg_destroy_decompress(p_jpeg->read);
+
+    if (p_jpeg->fp) {
+        fclose(p_jpeg->fp);
+        p_jpeg->fp = NULL;
+    }
+
     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->image_width);
+static VALUE jpeg_image_s_open(int argc, VALUE *argv, VALUE self) {
+    VALUE path;
+
+    rb_scan_args(argc, argv, "1", &path);
+    Check_Type(path, T_STRING);
+
+    return jpeg_image_s_get_image_values(StringValuePtr(path), NULL, 0, self);
 }
 
-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->image_height);
+static VALUE jpeg_image_s_open_buffer(int argc, VALUE *argv, VALUE self) {
+    VALUE str;
+
+    rb_scan_args(argc, argv, "1", &str);
+    Check_Type(str, T_STRING);
+
+    return jpeg_image_s_get_image_values(NULL, StringValuePtr(str), RSTRING_LEN(str), self);
 }
 
 static VALUE jpeg_image_size(VALUE self) {
-    struct rb_jpeg_image *p_jpeg;
     VALUE array;
-    Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
 
     array = rb_ary_new();
-    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;
-}
-
-static VALUE jpeg_image_color_info(VALUE self) {
-    struct rb_jpeg_image *p_jpeg;
+    rb_ary_push(array, rb_iv_get(self, "@width"));
+    rb_ary_push(array, rb_iv_get(self, "@height"));
 
-    Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
-    return ID2SYM(rb_intern( p_jpeg->read->out_color_space == JCS_GRAYSCALE ? "gray" : "rgb" ));
+    return array;
 }
 
 static VALUE jpeg_image_raw_data(VALUE self) {
@@ -135,6 +168,12 @@ static VALUE jpeg_image_raw_data(VALUE self) {
 
     Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
 
+    jpeg_create_decompress(p_jpeg->read);
+
+    jpeg_image_s_set_read_source(p_jpeg);
+
+    jpeg_read_header(p_jpeg->read, TRUE);
+
     jpeg_start_decompress(p_jpeg->read);
 
     line_size = p_jpeg->read->output_width * p_jpeg->read->out_color_components;
@@ -165,6 +204,13 @@ static VALUE jpeg_image_raw_data(VALUE self) {
     }
     jpeg_finish_decompress(p_jpeg->read);
 
+    jpeg_destroy_decompress(p_jpeg->read);
+
+    if (p_jpeg->fp) {
+        fclose(p_jpeg->fp);
+        p_jpeg->fp = NULL;
+    }
+
     rb_iv_set(self, "@raw_data", matrix);
 
     return matrix;

data/ext/jpeg/jpeg_image.h

@@ -8,6 +8,9 @@ struct rb_jpeg_image {
     struct jpeg_decompress_struct *read;
     struct jpeg_error_mgr *error;
     FILE *fp;
+    char *filename;
+    char *buffer;
+    int64_t buffer_len;
 };
 
 void Init_jpeg_image();

data/lib/jpeg.rb

@@ -5,13 +5,7 @@ require 'jpeg/image'
 
 module Jpeg
   def self.open_buffer(str)
-    tmp = Tempfile::new("ruby-jpeg")
-    tmp.set_encoding Encoding::BINARY if tmp.respond_to?(:set_encoding)
-    tmp.puts str
-    tmp.rewind
-    jpeg = Jpeg::Image.open(tmp.path)
-    tmp.close
-    jpeg
+    Jpeg::Image.open_buffer(str)
   end
 
   def self.open(file)

data/lib/jpeg/version.rb

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

data/spec/leak_test.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+require 'jpeg'
+
+puts Process.pid
+file = File.expand_path('samples/sample.jpg', File.dirname(__FILE__))
+
+[10, 100, 1000].each do |n|
+  n.times do
+    @jpeg = Jpeg.open(file).raw_data
+  end
+  @jpeg = nil
+  GC.start
+  puts "#{n} times"
+  puts `pmap -x #{Process.pid} | tail -n 1`
+  # puts `lsof -p #{Process.pid}`
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpeg
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,7 +88,6 @@ extensions:
 - ext/jpeg/extconf.rb
 extra_rdoc_files: []
 files:
-- ".document"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -96,7 +95,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - ext/jpeg/extconf.rb
 - ext/jpeg/jpeg.c
 - ext/jpeg/jpeg.h
@@ -109,6 +107,7 @@ files:
 - lib/jpeg/image.rb
 - lib/jpeg/version.rb
 - spec/jpeg_spec.rb
+- spec/leak_test.rb
 - spec/samples/sample.jpg
 - spec/samples/sample.png
 - spec/spec_helper.rb
@@ -138,6 +137,7 @@ specification_version: 4
 summary: libjpeg wrapper for ruby
 test_files:
 - spec/jpeg_spec.rb
+- spec/leak_test.rb
 - spec/samples/sample.jpg
 - spec/samples/sample.png
 - spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/VERSION

@@ -1 +0,0 @@
-0.3.3