ruby-vips 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -1,4 +1,31 @@
-# master
+# master 
+...
+
+# Version 0.2.0
+
+Release date: 2012-06-29
+
+### Added
+
+* Add tile_cache [John Cupitt]
+* Add :sequential option to tiff, jpeg and png readers [John Cupitt]
+* Add raise if suitable pkg_config for libvips is not found, thanks to Pierre
+  Chapuis [Stanislaw Pankevich]
+* Add backward compatibility of 0.1.x ruby-vips with libvips versions less than 7.28 [John Cupitt]
+* Add Travis. ruby-vips now is being tested on travis-ci.org. [Stanislaw Pankevich]
+
+### Changed
+
+* Disable the vips8 operation cache to save some memory [John Cupitt]
+* Update example shrinker [John Cupitt]
+
+### Fixed
+
+* #8: Memory allocation-free issues [Grigoriy Chudnov]
+
+# Version 0.1.1
+
+Release date: 2012-06-22
 
 ### Changed
 

data/README.md

@@ -1,11 +1,35 @@
-## ruby-vips : A fast image processing extension for Ruby.
-
-note: this fork aims to track the latest stable vips. There are no plans to
-add more features, just to keep it working.
-
-ruby-vips is a ruby extension for [vips](http://www.vips.ecs.soton.ac.uk). It is
-extremely fast and it can process huge images without requiring the entire image
-to be loaded into memory.
+# ruby-vips : A fast image processing extension for Ruby.
+
+*Note*: ruby-vips git master is the development version and uses features
+from git master of libvips (the unreleased 7.29) as well. You may prefer
+the stable 0.2 branch of ruby-vips.
+
+ruby-vips is a ruby extension for [vips](http://www.vips.ecs.soton.ac.uk). 
+It is extremely fast and it can process huge images without requiring the 
+entire image to be loaded into memory. For example, the benchmark at 
+[vips-benchmarks](https://github.com/stanislaw/vips-benchmarks) loads a large
+image, crops, shrinks, sharpens and saves again:
+
+[![Build Status](https://secure.travis-ci.org/jcupitt/ruby-vips.png)](http://travis-ci.org/jcupitt/ruby-vips)
+
+<pre>
+real time in seconds, fastest of three runs
+benchmark       tiff    jpeg
+ruby-vips.rb    0.45    0.56    
+rmagick.rb      1.69    1.90    
+netpbm.sh       1.74    1.63    
+image-magick    2.87    3.02    
+image_sci.rb    3.19    2.90    
+
+peak memory use in kilobytes
+benchmark       peak RSS
+ruby-vips.rb    160400
+image_sci.rb    546992
+rmagick.rb      1370064
+</pre>
+
+See also [benchmarks at the official libvips
+website](http://www.vips.ecs.soton.ac.uk/index.php?title=Speed_and_Memory_Use).
 
 ruby-vips allows you to set up pipelines that don't get executed until you
 output the image to disk or to a string. This means you can create,
@@ -16,27 +40,30 @@ or to disk.
 ## Requirements.
 
   * OS X or Linux
-  * MRI 1.8.6, 1.8.7, 1.9.2 or Rubinius 1.0.1
-  * libvips 7.12.x, 7.20.x, 7.22.x, or 7.23.x
+  * MRI 1.8.7, 1.9.2
+  * libvips 7.29 and later (it will work with earlier libvips, but some
+    features may not be functional -- you may prefer the stable 0.1 branch)
 
 ## Installation.
 
 ### Ubuntu Prerequisites.
 
-    $ apt-get install libvips-dev
-
-The above installs libvips 7.20.x in Ubuntu 10.04 and 7.12.x in Ubuntu 8.04.
-Though ruby-vips will work with libvips 7.12.x, many features are disabled, and
-there are a few caveats.
+```bash
+$ apt-get install libvips-dev
+```
 
 ### OS X Prerequisites.
 
-    $ brew install vips -HEAD
-
-The above installs libvips 7.22.x
+```bash
+$ brew install vips -HEAD
+```
 
 TODO: Describe & test with macports.
 
+### Other platforms
+
+See [Installiation on various platforms](https://github.com/jcupitt/ruby-vips/wiki/installiation-on-various-platforms).
+
 ### Installing the gem.
 
 ```bash
@@ -51,46 +78,71 @@ gem 'ruby-vips'
 
 ## Documentation.
 
-ruby-vips has [rdoc documentation](http://rubyvips.holymonkey.com).
+ruby-vips has [rdoc
+documentation](http://rubydoc.info/gems/ruby-vips/0.1.1/frames). Also
+see [Wiki page](https://github.com/jcupitt/ruby-vips/wiki)
+
+## Small example
 
-## Example.
+See also the
+[examples](https://github.com/jcupitt/ruby-vips/tree/master/examples)
+directory.
 
-    require 'rubygems'
-    require 'vips'
-    include VIPS
+```ruby
+require 'rubygems'
+require 'vips'
+
+include VIPS
+
+# Create an image object. It will not actually load the image until needed.
+im = Image.jpeg('mypic.jpg')
 
-    # Create an image object. It will not actually load the image until needed.
-    im = Image.jpeg('mypic.jpg')
+# Shrink the jpeg by a factor of four when loading -- huge speed and CPU
+# improvements on large images.
+im = Image.jpeg('mypic.jpg', :shrink_factor => 4)
 
-    # Shrink the jpeg by a factor of four when loading -- huge speed and CPU
-    # improvements on large images.
-    im = Image.jpeg('mypic.jpg', :shrink_factor => 4)
+# Add a shrink by a factor of two to the pipeline. This will not actually be
+# executed yet.
+im_shrink_by_two = im.shrink(2)
 
-    # Add a shrink by a factor of two to the pipeline. This will not actually be
-    # executed yet.
-    im_shrink_by_two = im.shrink(2)
+# Write out the shrunk image to a PNG file. This is where the image is
+# actually loaded and resized. With images that allow for random access from
+# the hard drive (VIPS native format, tiled OpenEXR, ppm/pbm/pgm/pfm, tiled
+# tiff, and RAW images), the entire image is never read into memory.
+im_shrink_by_two.png('out.png', :interlace => true)
 
-    # Write out the shrunk image to a PNG file. This is where the image is
-    # actually loaded and resized. With images that allow for random access from
-    # the hard drive (VIPS native format, tiled OpenEXR, ppm/pbm/pgm/pfm, tiled
-    # tiff, and RAW images), the entire image is never read into memory.
-    im_shrink_by_two.png('out.png', :interlace => true)
+# All ruby-vips image commands can be chained, so the above sequence could
+# be written as:
+Image.jpeg('mypic.jpg', :shrink_factor => 4).shrink(2).png('out.png')
+
+# The statement above will load the jpeg (pre-shrunk by a factor of four),
+# shrink the image again by a factor of two, and then save as a png image.
+
+# 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')
+```
 
-    # All ruby-vips image commands can be chained, so the above sequence could
-    # be written as:
-    Image.jpeg('mypic.jpg', :shrink_factor => 4).shrink(2).png('out.png')
+## Gotchas
+
+### Contain memuse
+
+ruby-vips only finalises vips images on GC. In other words:
+
+```ruby
+a = Image.new(filename)
+a = nil
+```
 
-    # The statement above will load the jpeg (pre-shrunk by a factor of four),
-    # shrink the image again by a factor of two, and then save as a png image.
+will not release the resources associated with a, you have to
+either request a GC explicitly or wait for Ruby to GC for you. This can
+be a problem if you're processing many images.
 
-    # 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')
+We suggest you schedule a GC every 100 images processed.
 
 ## Why use ruby-vips?
 
   - It supports over 250 low-level image and color manipulation operations.
-  - Operations are chainable, and do not get executed until the image is sent to
-    an output.
-  - Fastest ruby library for resizing large images. See [benchmarks at the
-    official libvips website](http://www.vips.ecs.soton.ac.uk/index.php?title=Speed_and_Memory_Use).
+  - Operations are chainable, and do not get executed until the image is sent to an output.
+  - Memory use is low, even for very, very large images.
+  - Fastest ruby library for resizing large images. See [benchmarks at the official libvips website](http://www.vips.ecs.soton.ac.uk/index.php?title=Speed_and_Memory_Use) and [vips-benchmarks](https://github.com/stanislaw/vips-benchmarks)

data/ext/extconf.rb

@@ -4,7 +4,8 @@ require "mkmf"
 
 File::unlink("Makefile") if (File::exist?("Makefile"))
 
-%w{7.28 7.27 7.26 7.24 7.23 7.22 7.20}.each{|x| break if pkg_config("vips-#{x}")}
+VIPS_VERSIONS = %w[7.29 7.28 7.27 7.26 7.24 7.23 7.22 7.20]
+
+raise("There is no pkg_config for any of following libvips versions: #{VIPS_VERSIONS.join(', ')}") unless VIPS_VERSIONS.detect {|x| pkg_config("vips-#{x}") }
 
-have_header('vips/vips.h')
 create_makefile('vips_ext')

data/ext/image.c

@@ -27,8 +27,8 @@ img_free(vipsImg *im)
     if(im->in)
         im_close(im->in);
 
-	if(im->deps)
-		xfree(im->deps);
+    if(im->deps)
+        free(im->deps);
 
     xfree(im);
 }
@@ -36,10 +36,10 @@ img_free(vipsImg *im)
 static void
 img_mark(vipsImg *im)
 {
-	int i;
+    int i;
 
-	for (i = 0; i < im->deps_len; i++)
-		rb_gc_mark(im->deps[i]);
+    for (i = 0; i < im->deps_len; i++)
+        rb_gc_mark(im->deps[i]);
 }
 
 VALUE
@@ -49,7 +49,7 @@ img_alloc(VALUE klass)
     VALUE new = Data_Make_Struct(klass, vipsImg, img_mark, img_free, im);
     im->in = NULL;
     im->deps = NULL;
-	im->deps_len = 0;
+    im->deps_len = 0;
 
     return new;
 }
@@ -57,15 +57,15 @@ img_alloc(VALUE klass)
 void
 img_add_dep(vipsImg *im, VALUE dep)
 {
-	int i;
-	
-	for (i = 0; i < im->deps_len; i++)
-		if (im->deps[i] == dep)
-			return;
-
-	im->deps_len++;
-	im->deps = realloc(im->deps, im->deps_len * sizeof(VALUE*));
-	im->deps[im->deps_len - 1] = dep;
+    int i;
+    
+    for (i = 0; i < im->deps_len; i++)
+        if (im->deps[i] == dep)
+            return;
+
+    im->deps_len++;
+    im->deps = (VALUE*)realloc(im->deps, im->deps_len * sizeof(VALUE));
+    im->deps[im->deps_len - 1] = dep;
 }
 
 VALUE
@@ -112,7 +112,7 @@ img_spawn(VALUE parent)
 VALUE
 img_spawn2(VALUE parent1, VALUE parent2)
 {
-	VALUE new = img_spawn(parent1);
+    VALUE new = img_spawn(parent1);
     vipsImg *im;
     Data_Get_Struct(new, vipsImg, im);
 
@@ -123,7 +123,7 @@ img_spawn2(VALUE parent1, VALUE parent2)
 VALUE
 img_spawn3(VALUE parent1, VALUE parent2, VALUE parent3)
 {
-	VALUE new = img_spawn2(parent1, parent2);
+    VALUE new = img_spawn2(parent1, parent2);
     vipsImg *im;
     Data_Get_Struct(new, vipsImg, im);
 
@@ -179,10 +179,10 @@ img_coding_to_id(VipsCoding coding)
 static VALUE
 img_vtype(VALUE obj)
 {
-	GetImg(obj, data, im);
+    GetImg(obj, data, im);
 
     if (im)
-    	return ID2SYM(img_vtype_to_id(im->Type));
+        return ID2SYM(img_vtype_to_id(im->Type));
 
     return Qnil;
 }
@@ -198,7 +198,7 @@ img_vtype(VALUE obj)
 static VALUE
 img_coding(VALUE obj)
 {
-	GetImg(obj, data, im);
+    GetImg(obj, data, im);
 
     if (im)
         return ID2SYM(img_coding_to_id(im->Coding));
@@ -216,7 +216,7 @@ img_coding(VALUE obj)
 static VALUE
 img_kill(VALUE obj)
 {
-	GetImg(obj, data, im);
+    GetImg(obj, data, im);
     return INT2FIX(im->kill);
 }
 
@@ -230,7 +230,7 @@ img_kill(VALUE obj)
 static VALUE
 img_filename(VALUE obj)
 {
-	GetImg(obj, data, im);
+    GetImg(obj, data, im);
 
     if (im)
         return rb_tainted_str_new2(im->filename);
@@ -240,50 +240,50 @@ img_filename(VALUE obj)
 
 
 #define GETPIX( TYPE, CONVERSION ) { \
-	TYPE *p = (TYPE *) IM_IMAGE_ADDR(im, x, y); \
+    TYPE *p = (TYPE *) IM_IMAGE_ADDR(im, x, y); \
 \
-	if (sz == 1) \
-		return CONVERSION(*p); \
+    if (sz == 1) \
+        return CONVERSION(*p); \
 \
-	ary = rb_ary_new2(sz); \
-	for (i = 0; i < sz; i++) \
-		rb_ary_push(ary, CONVERSION(p[i])); \
+    ary = rb_ary_new2(sz); \
+    for (i = 0; i < sz; i++) \
+        rb_ary_push(ary, CONVERSION(p[i])); \
 \
-	return ary; \
+    return ary; \
 }
 
 #define CGETPIX( TYPE, CONVERSION ) { \
-	TYPE *p = (TYPE *) IM_IMAGE_ADDR(im, x, y); \
+    TYPE *p = (TYPE *) IM_IMAGE_ADDR(im, x, y); \
 \
-	ary = rb_ary_new2(sz); \
-	for (i = 0; i < sz; i++) { \
-		rb_ary_push(ary, rb_ary_new3(2, CONVERSION(p[0]), CONVERSION(p[1]))); \
-		p += 2; \
-	} \
+    ary = rb_ary_new2(sz); \
+    for (i = 0; i < sz; i++) { \
+        rb_ary_push(ary, rb_ary_new3(2, CONVERSION(p[0]), CONVERSION(p[1]))); \
+        p += 2; \
+    } \
 \
-	return ary; \
+    return ary; \
 }
 
 static VALUE
 img_pixel_to_rb(VipsImage *im, int x, int y)
 {
-	const int sz = im->Bands;
-	int i;
-	VALUE ary;
-
-	switch( im->BandFmt ) {
-	case IM_BANDFMT_UCHAR:     GETPIX( unsigned char, UINT2NUM ); break;
-	case IM_BANDFMT_CHAR:      GETPIX( signed char, INT2NUM ); break;
-	case IM_BANDFMT_USHORT:    GETPIX( unsigned short, UINT2NUM ); break;
-	case IM_BANDFMT_SHORT:     GETPIX( signed short, INT2NUM ); break;
-	case IM_BANDFMT_UINT:      GETPIX( unsigned int, UINT2NUM ); break;
-	case IM_BANDFMT_INT:       GETPIX( signed int, INT2FIX ); break;
-	case IM_BANDFMT_FLOAT:     GETPIX( float, rb_float_new ); break;
-
-	case IM_BANDFMT_DOUBLE:    GETPIX( double, rb_float_new ); break;
-	case IM_BANDFMT_COMPLEX:   CGETPIX( float, rb_float_new ); break; 
-	case IM_BANDFMT_DPCOMPLEX: CGETPIX( double, rb_float_new ); break; 
-	}
+    const int sz = im->Bands;
+    int i;
+    VALUE ary;
+
+    switch( im->BandFmt ) {
+    case IM_BANDFMT_UCHAR:     GETPIX( unsigned char, UINT2NUM ); break;
+    case IM_BANDFMT_CHAR:      GETPIX( signed char, INT2NUM ); break;
+    case IM_BANDFMT_USHORT:    GETPIX( unsigned short, UINT2NUM ); break;
+    case IM_BANDFMT_SHORT:     GETPIX( signed short, INT2NUM ); break;
+    case IM_BANDFMT_UINT:      GETPIX( unsigned int, UINT2NUM ); break;
+    case IM_BANDFMT_INT:       GETPIX( signed int, INT2FIX ); break;
+    case IM_BANDFMT_FLOAT:     GETPIX( float, rb_float_new ); break;
+
+    case IM_BANDFMT_DOUBLE:    GETPIX( double, rb_float_new ); break;
+    case IM_BANDFMT_COMPLEX:   CGETPIX( float, rb_float_new ); break; 
+    case IM_BANDFMT_DPCOMPLEX: CGETPIX( double, rb_float_new ); break; 
+    }
 }
 
 /*
@@ -301,17 +301,17 @@ img_pixel_to_rb(VipsImage *im, int x, int y)
 static VALUE
 img_aref(VALUE obj, VALUE v_x, VALUE v_y)
 {
-	int x = NUM2INT(v_x);
-	int y = NUM2INT(v_y);
-	GetImg(obj, data, im);
+    int x = NUM2INT(v_x);
+    int y = NUM2INT(v_y);
+    GetImg(obj, data, im);
 
-	if (im_incheck(im) || im_check_uncoded("img_aref", im))
-		vips_lib_error();
+    if (im_incheck(im) || im_check_uncoded("img_aref", im))
+        vips_lib_error();
 
-	if (x >= im->Xsize || x < 0 || y >= im->Ysize || y < 0)
-		rb_raise(rb_eIndexError, "Index out of bounds");
+    if (x >= im->Xsize || x < 0 || y >= im->Ysize || y < 0)
+        rb_raise(rb_eIndexError, "Index out of bounds");
 
-	return img_pixel_to_rb(im, x, y);
+    return img_pixel_to_rb(im, x, y);
 }
 
 /*
@@ -324,21 +324,21 @@ img_aref(VALUE obj, VALUE v_x, VALUE v_y)
 static VALUE
 img_each_pixel(VALUE obj)
 {
-	int x, y;
-	VALUE pixel;
-	GetImg(obj, data, im);
+    int x, y;
+    VALUE pixel;
+    GetImg(obj, data, im);
 
-	if (im_incheck(im) || im_check_uncoded("img_each_pixel", im))
-		return( Qnil );
+    if (im_incheck(im) || im_check_uncoded("img_each_pixel", im))
+        return( Qnil );
 
     for(y = 0; y < im->Ysize; y++) {
-		for(x = 0; x < im->Xsize; x++) {
-			pixel = img_pixel_to_rb(im, x, y);
-			rb_yield(rb_ary_new3(3, pixel, INT2FIX(x), INT2FIX(y)));
-		}
-	}
+        for(x = 0; x < im->Xsize; x++) {
+            pixel = img_pixel_to_rb(im, x, y);
+            rb_yield(rb_ary_new3(3, pixel, INT2FIX(x), INT2FIX(y)));
+        }
+    }
 
-	return obj;
+    return obj;
 }
 
 /*
@@ -351,12 +351,12 @@ img_each_pixel(VALUE obj)
 static VALUE
 img_data(VALUE obj)
 {
-	GetImg(obj, data, im);
+    GetImg(obj, data, im);
 
-	if (im_incheck(im) || im_check_uncoded("img_aref", im))
-		return( Qnil );
+    if (im_incheck(im) || im_check_uncoded("img_aref", im))
+        return( Qnil );
 
-	return rb_tainted_str_new(im->data, IM_IMAGE_SIZEOF_LINE(im) * im->Ysize);
+    return rb_tainted_str_new(im->data, IM_IMAGE_SIZEOF_LINE(im) * im->Ysize);
 }
 
 /*
@@ -398,8 +398,8 @@ init_Image(void)
     rb_define_singleton_method(cVIPSImage, "fractsurf", img_s_fractsurf, 2); // in image_freq_filt.c
     rb_define_singleton_method(cVIPSImage, "identity", img_s_identity, 1); // in image_histograms_lut.c
     rb_define_singleton_method(cVIPSImage, "identity_ushort", img_s_identity_ushort, 2); // in image_histograms_lut.c
-	rb_define_singleton_method(cVIPSImage, "invertlut", img_s_invertlut, 2); // in image_histograms_lut.c
-	rb_define_singleton_method(cVIPSImage, "buildlut", img_s_buildlut, 1); // in image_histograms_lut.c
+    rb_define_singleton_method(cVIPSImage, "invertlut", img_s_invertlut, 2); // in image_histograms_lut.c
+    rb_define_singleton_method(cVIPSImage, "buildlut", img_s_buildlut, 1); // in image_histograms_lut.c
     rb_define_singleton_method(cVIPSImage, "tone_build_range", img_s_tone_build_range, 10); // in image_histograms_lut.c
     rb_define_singleton_method(cVIPSImage, "tone_build", img_s_tone_build, 8); // in image_histograms_lut.c
 
@@ -410,47 +410,47 @@ init_Image(void)
     rb_define_method(cVIPSImage, "coding", img_coding, 0);
     rb_define_method(cVIPSImage, "filename", img_filename, 0);
     rb_define_method(cVIPSImage, "kill", img_kill, 0);
-	rb_define_method(cVIPSImage, "measure_area", img_measure_area, 7); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "stats", img_stats, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "max", img_max, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "min", img_min, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "avg", img_avg, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "deviate", img_deviate, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "maxpos", img_maxpos, -1); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "minpos", img_minpos, -1); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "maxpos_avg", img_maxpos_avg, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "bandmean", img_bandmean, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "add", img_add, 1); // in image_arithmetic.c
-	rb_define_alias(cVIPSImage, "+", "add");
-	rb_define_method(cVIPSImage, "subtract", img_subtract, 1); // in image_arithmetic.c
-	rb_define_alias(cVIPSImage, "-", "subtract");
-	rb_define_method(cVIPSImage, "invert", img_invert, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "lin", img_lin, 2); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "multiply", img_multiply, 1); // in image_arithmetic.c
-	rb_define_alias(cVIPSImage, "*", "multiply");
-	rb_define_method(cVIPSImage, "divide", img_divide, 1); // in image_arithmetic.c
-	rb_define_alias(cVIPSImage, "/", "divide");
-	rb_define_method(cVIPSImage, "remainder", img_remainder, -1); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "%", img_remainder_binop, 1);
-	rb_define_method(cVIPSImage, "recomb", img_recomb, 1); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "sign", img_sign, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "abs", img_abs, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "floor", img_floor, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "rint", img_rint, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "ceil", img_ceil, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "point", img_point, 4); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "pow", img_pow, -1); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "**", img_pow_binop, 1); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "expn", img_expn, -1); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "log", img_log, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "log10", img_log10, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "sin", img_sin, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "cos", img_cos, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "tan", img_tan, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "asin", img_asin, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "acos", img_acos, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "atan", img_atan, 0); // in image_arithmetic.c
-	rb_define_method(cVIPSImage, "cross_phase", img_cross_phase, 1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "measure_area", img_measure_area, 7); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "stats", img_stats, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "max", img_max, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "min", img_min, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "avg", img_avg, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "deviate", img_deviate, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "maxpos", img_maxpos, -1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "minpos", img_minpos, -1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "maxpos_avg", img_maxpos_avg, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "bandmean", img_bandmean, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "add", img_add, 1); // in image_arithmetic.c
+    rb_define_alias(cVIPSImage, "+", "add");
+    rb_define_method(cVIPSImage, "subtract", img_subtract, 1); // in image_arithmetic.c
+    rb_define_alias(cVIPSImage, "-", "subtract");
+    rb_define_method(cVIPSImage, "invert", img_invert, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "lin", img_lin, 2); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "multiply", img_multiply, 1); // in image_arithmetic.c
+    rb_define_alias(cVIPSImage, "*", "multiply");
+    rb_define_method(cVIPSImage, "divide", img_divide, 1); // in image_arithmetic.c
+    rb_define_alias(cVIPSImage, "/", "divide");
+    rb_define_method(cVIPSImage, "remainder", img_remainder, -1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "%", img_remainder_binop, 1);
+    rb_define_method(cVIPSImage, "recomb", img_recomb, 1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "sign", img_sign, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "abs", img_abs, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "floor", img_floor, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "rint", img_rint, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "ceil", img_ceil, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "point", img_point, 4); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "pow", img_pow, -1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "**", img_pow_binop, 1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "expn", img_expn, -1); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "log", img_log, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "log10", img_log10, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "sin", img_sin, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "cos", img_cos, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "tan", img_tan, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "asin", img_asin, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "acos", img_acos, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "atan", img_atan, 0); // in image_arithmetic.c
+    rb_define_method(cVIPSImage, "cross_phase", img_cross_phase, 1); // in image_arithmetic.c
     rb_define_method(cVIPSImage, "and", img_and, -1); // in image_boolean.c
     rb_define_method(cVIPSImage, "&", img_and_binop, 1);
     rb_define_method(cVIPSImage, "or", img_or, -1); // in image_boolean.c
@@ -488,12 +488,12 @@ init_Image(void)
     rb_define_method(cVIPSImage, "de00_from_lab", img_de00_from_lab, 1); // in image_colour.c
     rb_define_method(cVIPSImage, "de_from_xyz", img_de_from_xyz, 1); // in image_colour.c
     rb_define_method(cVIPSImage, "de_from_lab", img_de_from_lab, 1); // in image_colour.c
-	rb_define_method(cVIPSImage, "im_lab_morph", img_lab_morph, 5); // in image_colour.c
-	rb_define_method(cVIPSImage, "icc_transform", img_icc_transform, 3); // in image_colour.c
-	rb_define_method(cVIPSImage, "icc_import", img_icc_import, 2); // in image_colour.c
-	rb_define_method(cVIPSImage, "icc_import_embedded", img_icc_import_embedded, 1); // in image_colour.c
-	rb_define_method(cVIPSImage, "icc_export_depth", img_icc_export_depth, 3); // in image_colour.c
-	rb_define_method(cVIPSImage, "icc_ac2rc", img_icc_ac2rc, 1); // in image_colour.c
+    rb_define_method(cVIPSImage, "im_lab_morph", img_lab_morph, 5); // in image_colour.c
+    rb_define_method(cVIPSImage, "icc_transform", img_icc_transform, 3); // in image_colour.c
+    rb_define_method(cVIPSImage, "icc_import", img_icc_import, 2); // in image_colour.c
+    rb_define_method(cVIPSImage, "icc_import_embedded", img_icc_import_embedded, 1); // in image_colour.c
+    rb_define_method(cVIPSImage, "icc_export_depth", img_icc_export_depth, 3); // in image_colour.c
+    rb_define_method(cVIPSImage, "icc_ac2rc", img_icc_ac2rc, 1); // in image_colour.c
     rb_define_method(cVIPSImage, "to_mask", img_to_mask, 0); // in image_conversion.c
     rb_define_method(cVIPSImage, "copy_file", img_copy_file, 0);  // in image_conversion.c
     rb_define_method(cVIPSImage, "dup", img_dup, 0); // in image_conversion.c
@@ -512,6 +512,7 @@ init_Image(void)
     rb_define_method(cVIPSImage, "extract_band", img_extract_band, -1); // in image_conversion.c
     rb_define_method(cVIPSImage, "extract_area", img_extract_area, -1); // in image_conversion.c
     rb_define_method(cVIPSImage, "embed", img_embed, 5); // in image_conversion.c
+    rb_define_method(cVIPSImage, "tile_cache", img_tile_cache, 3); // in image_conversion.c
     rb_define_method(cVIPSImage, "bandjoin", img_bandjoin, -1); // in image_conversion.c
     rb_define_method(cVIPSImage, "insert", img_insert, -1); // in image_conversion.c
     rb_define_method(cVIPSImage, "insert_noexpand", img_insert_noexpand, 3); // in image_conversion.c
@@ -542,7 +543,7 @@ init_Image(void)
     rb_define_method(cVIPSImage, "addgnoise", img_addgnoise, 1); // in image_convolution.c
     rb_define_method(cVIPSImage, "fwfft", img_fwfft, 0); // in image_freq_filt.c
     rb_define_method(cVIPSImage, "invfft", img_invfft, 0); // in image_freq_filt.c
-	rb_define_method(cVIPSImage, "rotquad", img_rotquad, 0); // in image_freq_filt.c
+    rb_define_method(cVIPSImage, "rotquad", img_rotquad, 0); // in image_freq_filt.c
     rb_define_method(cVIPSImage, "invfftr", img_invfftr, 0); // in image_freq_filt.c
     rb_define_method(cVIPSImage, "freqflt", img_freqflt, 1); // in image_freq_filt.c
     rb_define_method(cVIPSImage, "disp_ps", img_disp_ps, 0); // in image_freq_filt.c
@@ -565,20 +566,20 @@ init_Image(void)
     rb_define_method(cVIPSImage, "lhisteq", img_lhisteq, 2); // in image_histograms_lut.c
     rb_define_method(cVIPSImage, "stdif", img_stdif, 6); // in image_histograms_lut.c
     rb_define_method(cVIPSImage, "tone_analyze", img_tone_analyze, 6); // in image_histograms_lut.c
-	rb_define_method(cVIPSImage, "maplut", img_maplut, 1); // in image_histograms_lut.c
-	rb_define_method(cVIPSImage, "histplot", img_histplot, 0); // in image_histograms_lut.c
+    rb_define_method(cVIPSImage, "maplut", img_maplut, 1); // in image_histograms_lut.c
+    rb_define_method(cVIPSImage, "histplot", img_histplot, 0); // in image_histograms_lut.c
     rb_define_method(cVIPSImage, "dilate", img_dilate, 1); // in image_morphology.c
     rb_define_method(cVIPSImage, "erode", img_erode, 1); // in image_morphology.c
     rb_define_method(cVIPSImage, "rank", img_rank, 3); // in image_morphology.c
-	rb_define_method(cVIPSImage, "rank_image", img_rank_image, -1); // in image_morphology.c
-	rb_define_method(cVIPSImage, "maxvalue", img_maxvalue, -1); // in image_morphology.c
-	rb_define_method(cVIPSImage, "cntlines_h", img_cntlines_h, 0); // in image_morphology.c
-	rb_define_method(cVIPSImage, "cntlines_v", img_cntlines_v, 0); // in image_morphology.c
-	rb_define_method(cVIPSImage, "zerox_pos", img_zerox_pos, 0); // in image_morphology.c
-	rb_define_method(cVIPSImage, "zerox_neg", img_zerox_neg, 0); // in image_morphology.c
-	rb_define_method(cVIPSImage, "profile_h", img_profile_h, 0); // in image_morphology.c
-	rb_define_method(cVIPSImage, "profile_v", img_profile_v, 0); // in image_morphology.c
-	rb_define_method(cVIPSImage, "label_regions", img_label_regions, 0); // in image_morphology.c
+    rb_define_method(cVIPSImage, "rank_image", img_rank_image, -1); // in image_morphology.c
+    rb_define_method(cVIPSImage, "maxvalue", img_maxvalue, -1); // in image_morphology.c
+    rb_define_method(cVIPSImage, "cntlines_h", img_cntlines_h, 0); // in image_morphology.c
+    rb_define_method(cVIPSImage, "cntlines_v", img_cntlines_v, 0); // in image_morphology.c
+    rb_define_method(cVIPSImage, "zerox_pos", img_zerox_pos, 0); // in image_morphology.c
+    rb_define_method(cVIPSImage, "zerox_neg", img_zerox_neg, 0); // in image_morphology.c
+    rb_define_method(cVIPSImage, "profile_h", img_profile_h, 0); // in image_morphology.c
+    rb_define_method(cVIPSImage, "profile_v", img_profile_v, 0); // in image_morphology.c
+    rb_define_method(cVIPSImage, "label_regions", img_label_regions, 0); // in image_morphology.c
     rb_define_method(cVIPSImage, "lrmerge", img_lrmerge, -1); // in image_mosaicing.c
     rb_define_method(cVIPSImage, "tbmerge", img_tbmerge, -1); // in image_mosaicing.c
     rb_define_method(cVIPSImage, "lrmerge1", img_lrmerge1, -1); // in image_mosaicing.c
@@ -590,8 +591,8 @@ init_Image(void)
     rb_define_method(cVIPSImage, "global_balance", img_global_balance, 1); // in image_mosaicing.c
     rb_define_method(cVIPSImage, "global_balancef", img_global_balancef, 1); // in image_mosaicing.c
     rb_define_method(cVIPSImage, "correl", img_correl, 7); // in image_mosaicing.c
-	rb_define_method(cVIPSImage, "align_bands", img_align_bands, 0); // in image_mosaicing.c
-	rb_define_method(cVIPSImage, "maxpos_subpel", img_maxpos_subpel, 0); // in image_mosaicing.c
+    rb_define_method(cVIPSImage, "align_bands", img_align_bands, 0); // in image_mosaicing.c
+    rb_define_method(cVIPSImage, "maxpos_subpel", img_maxpos_subpel, 0); // in image_mosaicing.c
     rb_define_method(cVIPSImage, "equal", img_equal, -1); // in image_relational.c
     rb_define_method(cVIPSImage, "notequal", img_notequal, -1); // in image_relational.c
     rb_define_method(cVIPSImage, "less", img_less, -1); // in image_relational.c
@@ -608,24 +609,24 @@ init_Image(void)
     rb_define_method(cVIPSImage, "match_linear", img_match_linear, 9); // in image_resample.c
     rb_define_method(cVIPSImage, "match_linear_search", img_match_linear_search, 11); // in image_resample.c
 
-	id_b_w = rb_intern("B_W");
-	id_histogram = rb_intern("HISTOGRAM");
-	id_fourier = rb_intern("FOURIER");
-	id_xyz = rb_intern("XYZ");
-	id_lab = rb_intern("LAB");
-	id_cmyk = rb_intern("CMYK");
-	id_labq = rb_intern("LABQ");
-	id_rgb = rb_intern("RGB");
-	id_ucs = rb_intern("UCS");
-	id_lch = rb_intern("LCH");
-	id_labs = rb_intern("LABS");
-	id_srgb = rb_intern("sRGB");
-	id_yxy = rb_intern("YXY");
-	id_rgb16 = rb_intern("RGB16");
-	id_grey16 = rb_intern("GREY16");
-
-	id_none = rb_intern("NONE");
-	id_rad = rb_intern("RAD");
+    id_b_w = rb_intern("B_W");
+    id_histogram = rb_intern("HISTOGRAM");
+    id_fourier = rb_intern("FOURIER");
+    id_xyz = rb_intern("XYZ");
+    id_lab = rb_intern("LAB");
+    id_cmyk = rb_intern("CMYK");
+    id_labq = rb_intern("LABQ");
+    id_rgb = rb_intern("RGB");
+    id_ucs = rb_intern("UCS");
+    id_lch = rb_intern("LCH");
+    id_labs = rb_intern("LABS");
+    id_srgb = rb_intern("sRGB");
+    id_yxy = rb_intern("YXY");
+    id_rgb16 = rb_intern("RGB16");
+    id_grey16 = rb_intern("GREY16");
+
+    id_none = rb_intern("NONE");
+    id_rad = rb_intern("RAD");
 
     init_Image_colour();
     init_Image_conversion();

data/ext/image_conversion.c

@@ -473,6 +473,30 @@ img_embed(VALUE obj, VALUE type_v, VALUE x, VALUE y, VALUE width, VALUE height)
     return new;  
 }
 
+/*
+ *  call-seq:
+ *     im.tile_cache(tile_width, tile_height, max_tiles) -> image
+ *
+ * This operation behaves rather like copy between images, 
+ * except that it keeps a cache of computed pixels. 
+ * This cache is made of up to max_tiles tiles (a value of -1 for
+ * means any number of tiles), and each tile is of size tile_width
+ * by tile_height pixels. 
+ */
+
+VALUE
+img_tile_cache(VALUE obj, VALUE tile_width, VALUE tile_height, VALUE max_tiles)
+{
+    GetImg(obj, data, im);
+    OutImg(obj, new, data_new, im_new);
+
+    if (im_tile_cache(im, im_new,
+	NUM2INT(tile_width), NUM2INT(tile_height), NUM2INT(max_tiles)))
+        vips_lib_error();
+
+    return new;  
+}
+
 /*
  *  call-seq:
  *     im.bandjoin(other_image, ...) -> image

data/ext/image_conversion.h

@@ -19,6 +19,7 @@ VALUE img_s_text(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 VALUE img_extract_band(int, VALUE*, VALUE);
 VALUE img_extract_area(int, VALUE*, VALUE);
 VALUE img_embed(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+VALUE img_tile_cache(VALUE, VALUE, VALUE, VALUE);
 VALUE img_bandjoin(int, VALUE *argv, VALUE);
 VALUE img_insert_noexpand(VALUE, VALUE, VALUE, VALUE);
 VALUE img_insert(int, VALUE *argv, VALUE);
@@ -34,4 +35,4 @@ VALUE img_rot180(VALUE);
 VALUE img_rot270(VALUE);
 VALUE img_subsample(int, VALUE*, VALUE);
 VALUE img_zoom(int, VALUE*, VALUE);
-void init_Image_conversion();
+void init_Image_conversion();

data/ext/ruby_vips.c

@@ -72,8 +72,8 @@ init_vips_library()
     argv_0 = rb_gv_get("0");
 
     if (NIL_P(argv_0))
-		im_init_world("");
-	else
+        im_init_world("");
+    else
         im_init_world(RSTRING_PTR(argv_0));
 
     argv_v = rb_const_get(rb_mKernel, rb_intern("ARGV"));
@@ -88,8 +88,6 @@ init_vips_library()
         for (i=0; i < argc - 1; i++)
             argv[i+1] = RSTRING_PTR(RARRAY_PTR(argv_v)[i]);
 
-		im_init_world(argv[0]);
-
         context = g_option_context_new("- ruby-vips");
         g_option_context_set_ignore_unknown_options(context, TRUE);
 
@@ -100,6 +98,13 @@ init_vips_library()
 
         xfree(argv);
     }
+
+    /* 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
+    vips_cache_set_max_mem( 0 );
+#endif
 }
 
 /*

data/lib/vips/reader.rb

@@ -69,6 +69,7 @@ module VIPS
   class JPEGReader < Reader
     attr_reader :shrink_factor
     attr_accessor :fail_on_warn
+    attr_accessor :sequential
 
     SHRINK_FACTOR = [1, 2, 4, 8]
 
@@ -76,9 +77,11 @@ module VIPS
     def initialize(path, options={})
       @shrink_factor = 1
       @fail_on_warn = false
+      @sequential = false
 
       self.shrink_factor = options[:shrink_factor] if options.has_key?(:shrink_factor)
       self.fail_on_warn = options[:fail_on_warn] if options.has_key?(:fail_on_warn)
+      self.sequential = options[:sequential] if options.has_key?(:sequential)
 
       super path, options
     end
@@ -86,7 +89,10 @@ module VIPS
     # Read the jpeg file from disk and return a VIPS Image object.
     def read
       str = "#{@path}:#{shrink_factor}"
-      str << ",fail" if @fail_on_warn
+      str << "," 
+      str << "fail" if @fail_on_warn
+      str << "," 
+      str << "sequential" if @sequential
 
       read_internal str
     end
@@ -105,17 +111,24 @@ module VIPS
 
   class TIFFReader < Reader
     attr_reader :page_number
+    attr_accessor :sequential
 
     # Create a tiff image file reader.
     def initialize(path, options={})
+      @page_number = nil
+      @sequential = false
+
       self.page_number = options[:page_number] if options.has_key?(:page_number)
+      self.sequential = options[:sequential] if options.has_key?(:sequential)
       super path, options
     end
 
     # Read the tiff file from disk and return a VIPS Image object.
     def read
-      str = @path
-      str << ":#{@page_number}" if @page_number
+      str = "#{@path}:"
+      str << "#{@page_number}" if @page_number
+      str << ","
+      str << "sequential" if @sequential
 
       read_internal str
     end
@@ -131,6 +144,27 @@ module VIPS
     end
   end
 
+  class PNGReader < Reader
+    attr_accessor :sequential
+
+    # Create a png image file reader.
+    def initialize(path, options={})
+      @sequential = false
+
+      self.sequential = options[:sequential] if options.has_key?(:sequential)
+      super path, options
+    end
+
+    # Read the png file from disk and return a VIPS Image object.
+    def read
+      str = @path
+      str << ":"
+      str << "sequential" if @sequential
+
+      read_internal str
+    end
+  end
+
   class Image
 
     # Load a ppm file straight to a VIPS Image.

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/ruby-vips.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2012-06-21"
+  s.date = "2012-06-29"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -88150975
+      hash: -423159501
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: