first try and sort-of works

jcupitt · jcupitt · commit 9df60293c2d4 · 2013-06-15T17:58:32.000+01:00
try:

----------

require 'rubygems'
require 'vips'

include VIPS

data = IO.read('/home/john/pics/shark.jpg')

reader = JPEGReader.new(data, :shrink_factor =&gt; 2, :fail_on_warn =&gt;
true)

im = reader.read_buffer

im.write('out.png')
----------
diff --git a/TODO b/TODO
@@ -1,3 +1,13 @@
+btw, there's a method called to_memory in JPEGWriter and PNGWriter, that works
+cool to retrieve the VIPS::Image as a memory buffer, will be cool if this
+method is moved up to Writer and then it handles the correct to_memory method
+using the image headers.
+
+add from_memory? or should the open method accept a blob in place of a path?
+
+
+
+
 TODO
 * Verify that all memory gets released when vips ops return errors. Namely,
   make sure that the allocated IMAGEs get released via ruby's free callbacks.
diff --git a/ext/reader.c b/ext/reader.c
@@ -51,6 +51,22 @@ reader_read_internal(VALUE obj, VALUE path, VALUE flags)
     return img_init(cVIPSImage, im_new);
 }
 
+static VALUE
+jpeg_buf_internal(VALUE obj, VALUE buf, VALUE shrink, VALUE fail)
+{
+    VipsImage *im_new;
+
+    buf = StringValue(buf);
+
+    if (vips_jpegload_buffer(RSTRING_PTR(buf), RSTRING_LEN(buf), &im_new, 
+        "shrink", NUM2INT(shrink),
+        "fail", NUM2INT(fail),
+	NULL))
+        vips_lib_error();
+
+    return img_init(cVIPSImage, im_new);
+}
+
 /* :nodoc: */
 
 static VALUE
@@ -118,6 +134,7 @@ init_Reader(void)
      */
 
     VALUE jpeg_reader = rb_define_class_under(mVIPS, "JPEGReader", reader);
+    rb_define_private_method(jpeg_reader, "buf_internal", jpeg_buf_internal, 3);
     reader_fmt_set(jpeg_reader, "jpeg");
 
     /*
diff --git a/lib/vips/reader.rb b/lib/vips/reader.rb
@@ -79,6 +79,18 @@ def read
       @_im = read_retry str, seq
     end
 
+    def b_to_i(b)
+      if b
+        1
+      else
+        0
+      end
+    end
+
+    def read_buffer
+      @_im = buf_internal @path, @shrink_factor, b_to_i(@fail_on_warn)
+    end
+
     # Shrink the jpeg while reading from disk. This means that the entire image
     # never has to be loaded in memory. Shrink factor can be 1 (no shrink), 2,
     # 4, or 8.
diff --git a/lib/vips/version.rb b/lib/vips/version.rb
@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end
