cleanups for new buffer read

jcupitt · jcupitt · commit 798b2b041fdb · 2013-06-16T11:13:27.000+01:00
use vips8 API for buffer read/write stuff, if possible, it improves
compatibility

fix an oops in version #if-ing
diff --git a/README.md b/README.md
@@ -185,6 +185,30 @@ Image.jpeg('large.png', :sequential => true).shrink(2).png('out.png')
 # If you want to let vips determine file formats, you can use the generic
 # reader and writer:
 Image.new('mypic.jpg').shrink(2).write('out.png')
+
+# You can also read and write images from memory areas. For example:
+
+jpeg_data = IO.read('mypic.jpg')
+reader = JPEGReader.new(jpeg_data, :shrink_factor => 2, :fail_on_warn => true)
+im = reader.read_buffer
+
+# brighten
+im = im.lin(1.5, 0)
+
+# As above, the image will not be processed until the .to_memory() method 
+# is called, and then will only decompress the section being processed. 
+# You will need to have all of the compressed data in memory at once though. 
+
+writer = JPEGWriter.new(im, :compression => 2, :interlace => false)
+png_data = writer.to_memory
+IO.write('out.png', png_data)
+
+writer = JPEGWriter.new(im, :quality => 50)
+jpeg_data = writer.to_memory
+IO.write('out.jpg', jpeg_data)
+
+# VIPS currently only suports JPEG and PNG memory compress and decompress. 
+# We hope to add other formats in future. 
 ```
 
 ## Why use ruby-vips?
diff --git a/ext/reader.c b/ext/reader.c
@@ -56,13 +56,19 @@ jpeg_buf_internal(VALUE obj, VALUE buf, VALUE shrink, VALUE fail)
 {
     VipsImage *im_new;
 
+    im_new = NULL; 
+
+#if IM_MAJOR_VERSION >= 7 || IM_MINOR_VERSION >= 28
     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();
+#else
+    rb_raise(eVIPSError, "This method is not implemented in your version of VIPS");
+#endif
 
     return img_init(cVIPSImage, im_new);
 }
diff --git a/ext/ruby_vips.c b/ext/ruby_vips.c
@@ -130,7 +130,7 @@ init_vips_library()
     /* We use the vips7 interface, so the vips8 cache will not help us.
      * Disable it and save 100mb or so of memory in vips-7.28 and later.
      */
-#if IM_MAJOR_VERSION >= 7 && IM_MINOR_VERSION >= 28
+#if IM_MAJOR_VERSION >= 7 || IM_MINOR_VERSION >= 28
     vips_cache_set_max_mem( 0 );
 #endif
 }
diff --git a/ext/writer.c b/ext/writer.c
@@ -147,8 +147,23 @@ jpeg_buf_internal(VALUE obj, VALUE quality)
 
     GetImg(obj, data, im);
 
+#if IM_MAJOR_VERSION >= 7 || IM_MINOR_VERSION >= 28
+{
+    size_t len;
+
+    if (vips_jpegsave_buffer(im, &buf, &len,
+        "Q", NUM2INT(quality),
+	NULL))
+        vips_lib_error();
+
+    /* Argh.
+     */
+    length = len;
+}
+#else
     if (im_vips2bufjpeg(im, NULL, NUM2INT(quality), &buf, &length)) 
         vips_lib_error();
+#endif
 
     return rb_tainted_str_new(buf, length);
 }
@@ -197,19 +212,25 @@ ppm_write_internal(VALUE obj, VALUE path)
 static VALUE
 png_buf_internal(VALUE obj, VALUE compression, VALUE interlace)
 {
-#if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 23
     char *buf;
     size_t length;
     GetImg(obj, data, im);
 
+#if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 28
+    if (vips_pngsave_buffer(im, &buf, &length,
+        "compression", NUM2INT(compression),
+	"interlace", NUM2INT(interlace),
+	NULL))
+        vips_lib_error();
+#elif IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 23
     if (im_vips2bufpng(im, NULL, NUM2INT(compression), NUM2INT(interlace),
         &buf, &length)) 
         vips_lib_error();
-
-    return rb_tainted_str_new(buf, length);
 #else
     rb_raise(eVIPSError, "This method is not implemented in your version of VIPS");
 #endif
+
+    return rb_tainted_str_new(buf, length);
 }
 
 /* :nodoc: */

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ init_vips_library()`
`130`	`130`	`/* We use the vips7 interface, so the vips8 cache will not help us.`
`131`	`131`	`* Disable it and save 100mb or so of memory in vips-7.28 and later.`
`132`	`132`	`*/`
`133`		`-#if IM_MAJOR_VERSION >= 7 && IM_MINOR_VERSION >= 28`
	`133`	`+#if IM_MAJOR_VERSION >= 7 \|\| IM_MINOR_VERSION >= 28`
`134`	`134`	`vips_cache_set_max_mem( 0 );`
`135`	`135`	`#endif`
`136`	`136`	`}`