ruby-vips 0.3.5 → 0.3.6

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # master 
 
+# Version 0.3.6
+
+* add png and jpg load from memory buffer [John Cupitt]
+* README updated to include buffer read/write example [John Cupitt]
+* better vips version testing [John Cupitt]
+* spec tests for new buffer read/write code [John Cupitt]
+* fix rdoc build to include C sources [John Cupitt]
+* better compat with older libvips [John Cupitt]
+
 # Version 0.3.5
 
 * rb_raise() in mask.c no longer passes a string pointer as the fmt arg, stopping gcc bailing out on some platforms [John Cupitt]

data/Gemfile.lock

@@ -1,25 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.4)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -43,7 +43,7 @@ latest libvips you can.
 ## Requirements.
 
   * OS X or Linux
-  * MRI 1.8.7, 1.9.2
+  * MRI 1.8.7, 1.9.3
   * libvips 7.24 and later (it will work with earlier libvips, but some
     features may not be functional)
 
@@ -58,18 +58,50 @@ $ apt-get install libvips-dev
 ### OS X Prerequisites.
 
 ```bash
-$ brew install --use-llvm vips
+$ brew tap homebrew/science
+$ brew install vips
 ```
 
-You may need to set your PKG_CONFIG_PATH before vips can see your libpng. Try
-something like:
+This will give you a very bare-bones vips, missing things like imagemagick
+loading, openslide support, FFTs, and so on. To get a list of all the optional
+dependencies, try:
 
 ```bash
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
+$ brew info vips
 ```
 
-See the Mac OS X Lion section in [Installation on various
-platforms](https://github.com/jcupitt/ruby-vips/wiki/installation-on-various-platforms).
+For a full-fat version, try:
+
+```bash
+$ brew install vips --with-cfitsio --with-fftw --with-imagemagick \
+    --with-libexif --with-liboil --with-libtiff --with-little-cms \
+    --with-openexr --with-openslide --with-pango
+```
+
+If you want to build things outside homebrew which depend on vips,
+such as ruby-vips, your pkg-config will need to be working. You
+need to point pkg-config at the homebrew area, and, additionally, at
+homebrew's libxml2 area:
+
+In your .profile, add something like:
+
+```bash
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig
+```
+
+To verify that your vips install is correct and working, try:
+
+```bash
+$ vips --version
+vips-7.32.1-Mon May 20 10:01:38 BST 2013
+```
+
+To verrify that your pkg-config is working correctly with vips, try:
+
+```bash
+$ pkg-config vips --libs
+-L/usr/local/Cellar/vips/7.32.1/lib ... a lot of stuff
+```
 
 TODO: Describe & test with macports.
 
@@ -84,18 +116,18 @@ platforms](https://github.com/jcupitt/ruby-vips/wiki/installation-on-various-pla
 $ gem install ruby-vips
 ```
 
-Alternatively, for a debug build:
-
-```bash
-$ gem install ruby-vips -- --enable-debug
-```
-
 or include it in Gemfile:
 
 ```ruby
 gem 'ruby-vips'
 ```
 
+For a debug build:
+
+```bash
+$ gem install ruby-vips -- --enable-debug
+```
+
 ## Documentation.
 
 ruby-vips has [rdoc
@@ -153,6 +185,37 @@ 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
+
+# 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. 
+
+# Note that this means you will get a coredump if you free the compressed
+# image buffer (jpeg_data above) before the write has completed.
+
+writer = PNGWriter.new(im, :compression => 2, :interlace => false)
+png_data = writer.to_memory
+IO.write('out.png', png_data)
+
+# Only JPEG, PNG and uncompressed memory images are supported at the moment,
+# and png memory read is only in vips-7.34 and later.
+
+# We hope to add other formats in future. 
+
+png_data = IO.read('mypic.png')
+reader = PNGReader.new(png_data)
+im = reader.read_buffer
+
+writer = JPEGWriter.new(im, :quality => 50)
+jpeg_data = writer.to_memory
+IO.write('out.jpg', jpeg_data)
+
 ```
 
 ## Why use ruby-vips?

data/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.

data/ext/image_conversion.c

@@ -68,7 +68,7 @@ img_copy_swap(VALUE obj)
 VALUE
 img_copy_native(VALUE obj, VALUE input_msb_first)
 {
-#if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 22
+#if ATLEAST_VIPS( 7, 22 )
     vipsImg *in, *out;
     int msb_first;
 

data/ext/image_freq_filt.c

@@ -71,7 +71,7 @@ img_invfftr(VALUE obj)
 	RUBY_VIPS_UNARY(im_invfftr);
 }
 
-#if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 22
+#if ATLEAST_VIPS( 7, 22 )
 
 /*
  *  call-seq:

data/ext/image_histograms_lut.c

@@ -427,7 +427,7 @@ img_gammacorrect(VALUE obj, VALUE exponent)
 VALUE
 img_mpercent_hist(VALUE obj, VALUE percent)
 {
-#if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 22
+#if ATLEAST_VIPS( 7, 22 )
     int ret;
 	GetImg(obj, data, im);
     
@@ -627,7 +627,7 @@ VALUE
 img_tone_analyse(VALUE obj,
 	VALUE ps, VALUE pm, VALUE ph, VALUE s, VALUE m, VALUE h)
 {
-#if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 23
+#if ATLEAST_VIPS( 7, 23 )
 	GetImg(obj, data, im);
 	OutImg(obj, new, data_new, im_new);
 

data/ext/reader.c

@@ -51,6 +51,48 @@ 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;
+
+    im_new = NULL; 
+
+#if ATLEAST_VIPS( 7, 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);
+}
+
+static VALUE
+png_buf_internal(VALUE obj, VALUE buf)
+{
+    VipsImage *im_new;
+
+    im_new = NULL; 
+
+#if ATLEAST_VIPS( 7, 34 )
+    buf = StringValue(buf);
+
+    if (vips_pngload_buffer(RSTRING_PTR(buf), RSTRING_LEN(buf), &im_new, 
+	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);
+}
+
 /* :nodoc: */
 
 static VALUE
@@ -118,6 +160,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");
 
     /*
@@ -139,6 +182,7 @@ init_Reader(void)
      */
 
     VALUE png_reader = rb_define_class_under(mVIPS, "PNGReader", reader);
+    rb_define_private_method(png_reader, "buf_internal", png_buf_internal, 1);
     reader_fmt_set(png_reader, "png");
 
     /*

data/ext/ruby_vips.c

@@ -127,10 +127,10 @@ init_vips_library()
         xfree(argv);
     }
 
+#if ATLEAST_VIPS( 7, 28 )
     /* 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/ext/ruby_vips.h

@@ -13,6 +13,12 @@ void vips_lib_error();
 #  define  __attribute__(x)  /*NOTHING*/
 #endif
 
+/* Vips lib version testing. This will not work if MINOR gets over 100,
+ * obviously.
+ */
+#define ATLEAST_VIPS( MAJOR, MINOR ) \
+	(IM_MAJOR_VERSION * 100 + IM_MINOR_VERSION >= MAJOR * 100 + MINOR)
+
 /* Backports from ruby 1.9.2 for ruby 1.8.7
  */
 

data/ext/tags

@@ -0,0 +1,450 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME	Exuberant Ctags	//
+!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
+!_TAG_PROGRAM_VERSION	5.9~svn20110310	//
+CGETPIX	image.c	241;"	d	file:
+DBL2NUM	ruby_vips.h	20;"	d
+GETPIX	image.c	228;"	d	file:
+GetImg	image.h	26;"	d
+Init_vips_ext	ruby_vips.c	/^Init_vips_ext()$/;"	f
+NEED_ruby_vips_class_map_all	ruby_vips.h	45;"	d
+OutImg	image.h	32;"	d
+OutImg2	image.h	36;"	d
+OutImg3	image.h	40;"	d
+OutPartial	image.h	44;"	d
+RARRAY_LENINT	ruby_vips.h	24;"	d
+RUBY_VIPS_BINARY	image.h	59;"	d
+RUBY_VIPS_H	ruby_vips.h	2;"	d
+RUBY_VIPS_HEADER_H	header.h	2;"	d
+RUBY_VIPS_IMAGE_H	image.h	2;"	d
+RUBY_VIPS_INTERPOLATOR_H	interpolator.h	2;"	d
+RUBY_VIPS_MASK_H	mask.h	2;"	d
+RUBY_VIPS_UNARY	image.h	48;"	d
+__attribute__	ruby_vips.h	13;"	d
+_vipsImg	image.h	/^struct _vipsImg {$/;"	s
+_vipsMask	mask.h	/^struct _vipsMask {$/;"	s
+ary_is_int_2d	mask.c	/^ary_is_int_2d(VALUE ary)$/;"	f	file:
+cVIPSImage	image.c	/^VALUE cVIPSImage;$/;"	v
+cVIPSInterpolator	interpolator.c	/^static VALUE cVIPSInterpolator;$/;"	v	file:
+cVIPSMask	mask.c	/^VALUE cVIPSMask;$/;"	v
+csv_write_internal	writer.c	/^csv_write_internal(VALUE obj, VALUE path)$/;"	f	file:
+deps	image.h	/^  VALUE *deps;$/;"	m	struct:_vipsImg
+deps_len	image.h	/^  int deps_len;$/;"	m	struct:_vipsImg
+dmask	mask.h	/^  DOUBLEMASK *dmask;$/;"	m	struct:_vipsMask
+dmask2rb	mask.c	/^dmask2rb(DOUBLEMASK *msk)$/;"	f
+eVIPSError	ruby_vips.c	/^VALUE mVIPS, eVIPSError;$/;"	v
+header_band_fmt	header.c	/^header_band_fmt(VALUE obj)$/;"	f	file:
+header_band_fmt_to_id	header.c	/^header_band_fmt_to_id(VipsBandFmt band_fmt)$/;"	f
+header_bands	header.c	/^header_bands(VALUE obj)$/;"	f	file:
+header_exif	header.c	/^header_exif(VALUE obj)$/;"	f	file:
+header_exif_p	header.c	/^header_exif_p(VALUE obj)$/;"	f	file:
+header_get	header.c	/^header_get(VALUE obj, VALUE name)$/;"	f	file:
+header_icc	header.c	/^header_icc(VALUE obj)$/;"	f	file:
+header_icc_p	header.c	/^header_icc_p(VALUE obj)$/;"	f	file:
+header_id_to_band_fmt	header.c	/^header_id_to_band_fmt(ID rb)$/;"	f
+header_meta_get	header.c	/^header_meta_get(VALUE obj, const char* name)$/;"	f	file:
+header_meta_get_string	header.c	/^header_meta_get_string(VALUE obj, const char* name)$/;"	f	file:
+header_meta_p	header.c	/^header_meta_p(VALUE obj, const char* name)$/;"	f	file:
+header_meta_set_string	header.c	/^header_meta_set_string(VALUE obj, const char* name, const char* value)$/;"	f	file:
+header_n_elements	header.c	/^header_n_elements(VALUE obj)$/;"	f	file:
+header_set	header.c	/^header_set(VALUE obj, VALUE name, VALUE value)$/;"	f	file:
+header_sizeof_element	header.c	/^header_sizeof_element(VALUE obj)$/;"	f	file:
+header_sizeof_line	header.c	/^header_sizeof_line(VALUE obj)$/;"	f	file:
+header_sizeof_pel	header.c	/^header_sizeof_pel(VALUE obj)$/;"	f	file:
+header_x_offset	header.c	/^header_x_offset(VALUE obj)$/;"	f	file:
+header_x_res	header.c	/^header_x_res(VALUE obj)$/;"	f	file:
+header_x_size	header.c	/^header_x_size(VALUE obj)$/;"	f	file:
+header_y_offset	header.c	/^header_y_offset(VALUE obj)$/;"	f	file:
+header_y_res	header.c	/^header_y_res(VALUE obj)$/;"	f	file:
+header_y_size	header.c	/^header_y_size(VALUE obj)$/;"	f	file:
+id_INTERPOLATORS	interpolator.c	/^static ID id_INTERPOLATORS;$/;"	v	file:
+id_absolute_colorimetric	image_colour.c	/^	id_absolute_colorimetric;$/;"	v	file:
+id_b_w	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
+id_black	image_conversion.c	/^static ID id_black, id_extend, id_repeat, id_mirror, id_white;$/;"	v	file:
+id_char	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short, id_uint, id_int,$/;"	v	file:
+id_cmyk	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
+id_complex	header.c	/^	id_float, id_complex, id_double, id_dbcomplex;$/;"	v	file:
+id_dbcomplex	header.c	/^	id_float, id_complex, id_double, id_dbcomplex;$/;"	v	file:
+id_double	header.c	/^	id_float, id_complex, id_double, id_dbcomplex;$/;"	v	file:
+id_extend	image_conversion.c	/^static ID id_black, id_extend, id_repeat, id_mirror, id_white;$/;"	v	file:
+id_float	header.c	/^	id_float, id_complex, id_double, id_dbcomplex;$/;"	v	file:
+id_fourier	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
+id_grey16	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+id_histogram	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
+id_int	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short, id_uint, id_int,$/;"	v	file:
+id_iv__vips_fmt	reader.c	/^ID id_iv__vips_fmt;$/;"	v
+id_lab	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
+id_labq	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
+id_labs	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+id_lch	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+id_match_both	image_mosaicing.c	/^ID id_match_left, id_match_right, id_match_both, id_match_none;$/;"	v
+id_match_left	image_mosaicing.c	/^ID id_match_left, id_match_right, id_match_both, id_match_none;$/;"	v
+id_match_none	image_mosaicing.c	/^ID id_match_left, id_match_right, id_match_both, id_match_none;$/;"	v
+id_match_right	image_mosaicing.c	/^ID id_match_left, id_match_right, id_match_both, id_match_none;$/;"	v
+id_mirror	image_conversion.c	/^static ID id_black, id_extend, id_repeat, id_mirror, id_white;$/;"	v	file:
+id_none	image.c	/^static ID id_none, id_rad;$/;"	v	file:
+id_notset	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short, id_uint, id_int,$/;"	v	file:
+id_perceptual	image_colour.c	/^static ID id_perceptual, id_relative_colorimetric, id_saturation,$/;"	v	file:
+id_rad	image.c	/^static ID id_none, id_rad;$/;"	v	file:
+id_relative_colorimetric	image_colour.c	/^static ID id_perceptual, id_relative_colorimetric, id_saturation,$/;"	v	file:
+id_repeat	image_conversion.c	/^static ID id_black, id_extend, id_repeat, id_mirror, id_white;$/;"	v	file:
+id_rgb	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+id_rgb16	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+id_saturation	image_colour.c	/^static ID id_perceptual, id_relative_colorimetric, id_saturation,$/;"	v	file:
+id_short	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short, id_uint, id_int,$/;"	v	file:
+id_srgb	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+id_uchar	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short, id_uint, id_int,$/;"	v	file:
+id_ucs	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+id_uint	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short, id_uint, id_int,$/;"	v	file:
+id_ushort	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short, id_uint, id_int,$/;"	v	file:
+id_white	image_conversion.c	/^static ID id_black, id_extend, id_repeat, id_mirror, id_white;$/;"	v	file:
+id_xyz	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
+id_yxy	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
+im_openout	ruby_vips.h	35;"	d
+im_openout	ruby_vips.h	36;"	d
+imask	mask.h	/^  INTMASK *imask;$/;"	m	struct:_vipsMask
+imask2rb	mask.c	/^imask2rb(INTMASK *msk)$/;"	f
+img_abs	image_arithmetic.c	/^img_abs(VALUE obj)$/;"	f
+img_acos	image_arithmetic.c	/^img_acos(VALUE obj)$/;"	f
+img_add	image_arithmetic.c	/^img_add(VALUE obj, VALUE obj2)$/;"	f
+img_add_dep	image.c	/^img_add_dep(vipsImg *im, VALUE dep)$/;"	f
+img_addgnoise	image_convolution.c	/^img_addgnoise(VALUE obj, VALUE sigma)$/;"	f
+img_affinei	image_resample.c	/^img_affinei(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_affinei_resize	image_resample.c	/^img_affinei_resize(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_align_bands	image_mosaicing.c	/^img_align_bands(VALUE obj)$/;"	f
+img_alloc	image.c	/^img_alloc(VALUE klass)$/;"	f
+img_and	image_boolean.c	/^img_and(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_and_binop	image_boolean.c	/^img_and_binop(VALUE obj, VALUE arg)$/;"	f
+img_and_const	image_boolean.c	/^img_and_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_and_img	image_boolean.c	/^img_and_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_aref	image.c	/^img_aref(VALUE obj, VALUE v_x, VALUE v_y)$/;"	f	file:
+img_asin	image_arithmetic.c	/^img_asin(VALUE obj)$/;"	f
+img_atan	image_arithmetic.c	/^img_atan(VALUE obj)$/;"	f
+img_avg	image_arithmetic.c	/^img_avg(VALUE obj) {$/;"	f
+img_bandjoin	image_conversion.c	/^img_bandjoin(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_bandmean	image_arithmetic.c	/^img_bandmean(VALUE obj)$/;"	f
+img_blend	image_relational.c	/^img_blend(VALUE obj, VALUE obj2, VALUE obj3)$/;"	f
+img_c2amph	image_conversion.c	/^img_c2amph(VALUE obj)$/;"	f
+img_c2imag	image_conversion.c	/^img_c2imag(VALUE obj)$/;"	f
+img_c2real	image_conversion.c	/^img_c2real(VALUE obj)$/;"	f
+img_c2rect	image_conversion.c	/^img_c2rect(VALUE obj)$/;"	f
+img_ceil	image_arithmetic.c	/^img_ceil(VALUE obj)$/;"	f
+img_clip2fmt	image_conversion.c	/^img_clip2fmt(VALUE obj, VALUE fmt)$/;"	f
+img_cntlines	image_morphology.c	/^img_cntlines(VALUE obj, int flag) {$/;"	f	file:
+img_cntlines_h	image_morphology.c	/^img_cntlines_h(VALUE obj) {$/;"	f
+img_cntlines_v	image_morphology.c	/^img_cntlines_v(VALUE obj) {$/;"	f
+img_coding	image.c	/^img_coding(VALUE obj)$/;"	f	file:
+img_coding_to_id	image.c	/^img_coding_to_id(VipsCoding coding)$/;"	f
+img_compass	image_convolution.c	/^img_compass(VALUE obj, VALUE mask)$/;"	f
+img_contrast_surface	image_convolution.c	/^img_contrast_surface(VALUE obj, VALUE half_win_size, VALUE spacing)$/;"	f
+img_conv	image_convolution.c	/^img_conv(VALUE obj, VALUE m)$/;"	f
+img_convsep	image_convolution.c	/^img_convsep(VALUE obj, VALUE mask)$/;"	f
+img_copy_file	image_conversion.c	/^img_copy_file(VALUE obj)$/;"	f
+img_copy_native	image_conversion.c	/^img_copy_native(VALUE obj, VALUE input_msb_first)$/;"	f
+img_copy_swap	image_conversion.c	/^img_copy_swap(VALUE obj)$/;"	f
+img_correl	image_mosaicing.c	/^img_correl(VALUE obj, VALUE obj2, VALUE xref, VALUE yref, VALUE xsec,$/;"	f
+img_cos	image_arithmetic.c	/^img_cos(VALUE obj)$/;"	f
+img_cross_phase	image_arithmetic.c	/^img_cross_phase(VALUE obj, VALUE obj2)$/;"	f
+img_data	image.c	/^img_data(VALUE obj)$/;"	f	file:
+img_de00_from_lab	image_colour.c	/^img_de00_from_lab(VALUE obj, VALUE obj2)$/;"	f
+img_de_from_lab	image_colour.c	/^img_de_from_lab(VALUE obj, VALUE obj2)$/;"	f
+img_de_from_xyz	image_colour.c	/^img_de_from_xyz(VALUE obj, VALUE obj2)$/;"	f
+img_decmc_from_lab	image_colour.c	/^img_decmc_from_lab(VALUE obj, VALUE obj2)$/;"	f
+img_deviate	image_arithmetic.c	/^img_deviate(VALUE obj) {$/;"	f
+img_dilate	image_morphology.c	/^img_dilate(VALUE obj, VALUE mask)$/;"	f
+img_disp_ps	image_freq_filt.c	/^img_disp_ps(VALUE obj)$/;"	f
+img_divide	image_arithmetic.c	/^img_divide(VALUE obj, VALUE obj2)$/;"	f
+img_dup	image_conversion.c	/^img_dup(VALUE obj)$/;"	f
+img_each_pixel	image.c	/^img_each_pixel(VALUE obj)$/;"	f	file:
+img_embed	image_conversion.c	/^img_embed(VALUE obj, VALUE type_v, VALUE x, VALUE y, VALUE width, VALUE height)$/;"	f
+img_equal	image_relational.c	/^img_equal(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_equal_const	image_relational.c	/^img_equal_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_equal_img	image_relational.c	/^img_equal_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_erode	image_morphology.c	/^img_erode(VALUE obj, VALUE mask)$/;"	f
+img_expn	image_arithmetic.c	/^img_expn(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_extract_area	image_conversion.c	/^img_extract_area(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_extract_band	image_conversion.c	/^img_extract_band(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_falsecolour	image_conversion.c	/^img_falsecolour(VALUE obj)$/;"	f
+img_fastcor	image_convolution.c	/^img_fastcor(VALUE obj, VALUE obj2)$/;"	f
+img_filename	image.c	/^img_filename(VALUE obj)$/;"	f	file:
+img_fliphor	image_conversion.c	/^img_fliphor(VALUE obj)$/;"	f
+img_flipver	image_conversion.c	/^img_flipver(VALUE obj)$/;"	f
+img_float_to_rad	image_colour.c	/^img_float_to_rad(VALUE obj)$/;"	f
+img_floor	image_arithmetic.c	/^img_floor(VALUE obj)$/;"	f
+img_free	image.c	/^img_free(vipsImg *im)$/;"	f	file:
+img_freqflt	image_freq_filt.c	/^img_freqflt(VALUE obj, VALUE obj2)$/;"	f
+img_fwfft	image_freq_filt.c	/^img_fwfft(VALUE obj)$/;"	f
+img_gammacorrect	image_histograms_lut.c	/^img_gammacorrect(VALUE obj, VALUE exponent)$/;"	f
+img_global_balance	image_mosaicing.c	/^img_global_balance(VALUE obj, VALUE gamma)$/;"	f
+img_global_balancef	image_mosaicing.c	/^img_global_balancef(VALUE obj, VALUE gamma)$/;"	f
+img_grad_x	image_convolution.c	/^img_grad_x(VALUE obj)$/;"	f
+img_grad_y	image_convolution.c	/^img_grad_y(VALUE obj)$/;"	f
+img_gradcor	image_convolution.c	/^img_gradcor(VALUE obj, VALUE obj2)$/;"	f
+img_gradient	image_convolution.c	/^img_gradient(VALUE obj, VALUE mask)$/;"	f
+img_grid	image_conversion.c	/^img_grid(VALUE obj, VALUE tile_height, VALUE across, VALUE down)$/;"	f
+img_heq	image_histograms_lut.c	/^img_heq(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_hist	image_histograms_lut.c	/^img_hist(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_hist_indexed	image_histograms_lut.c	/^img_hist_indexed(VALUE obj, VALUE obj2)$/;"	f
+img_histcum	image_histograms_lut.c	/^img_histcum(VALUE obj)$/;"	f
+img_histeq	image_histograms_lut.c	/^img_histeq(VALUE obj)$/;"	f
+img_histgr	image_histograms_lut.c	/^img_histgr(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_histnd	image_histograms_lut.c	/^img_histnd(VALUE obj, VALUE bins)$/;"	f
+img_histnorm	image_histograms_lut.c	/^img_histnorm(VALUE obj)$/;"	f
+img_histplot	image_histograms_lut.c	/^img_histplot(VALUE obj)$/;"	f
+img_histspec	image_histograms_lut.c	/^img_histspec(VALUE obj, VALUE obj2)$/;"	f
+img_hsp	image_histograms_lut.c	/^img_hsp(VALUE obj, VALUE obj2)$/;"	f
+img_icc_ac2rc	image_colour.c	/^img_icc_ac2rc(VALUE obj, VALUE depth, VALUE profile_filename)$/;"	f
+img_icc_export_depth	image_colour.c	/^img_icc_export_depth(VALUE obj, VALUE depth, VALUE output_profile_filename,$/;"	f
+img_icc_import	image_colour.c	/^img_icc_import(VALUE obj, VALUE input_profile_filename, VALUE intent)$/;"	f
+img_icc_import_embedded	image_colour.c	/^img_icc_import_embedded(VALUE obj, VALUE intent)$/;"	f
+img_icc_transform	image_colour.c	/^img_icc_transform(VALUE obj, VALUE input_profile_filename,$/;"	f
+img_id_to_intent	image_colour.c	/^img_id_to_intent(ID rb)$/;"	f
+img_ifthenelse	image_relational.c	/^img_ifthenelse(VALUE obj, VALUE obj2, VALUE obj3)$/;"	f
+img_init	image.c	/^img_init(VALUE klass, VipsImage *im)$/;"	f
+img_init_partial	image.c	/^img_init_partial()$/;"	f
+img_init_partial_anyclass	image.c	/^img_init_partial_anyclass(VALUE klass)$/;"	f
+img_insert	image_conversion.c	/^img_insert(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_insert_noexpand	image_conversion.c	/^img_insert_noexpand(VALUE obj, VALUE obj2, VALUE x, VALUE y)$/;"	f
+img_insert_one	image_conversion.c	/^img_insert_one(VALUE obj, VALUE obj2, VALUE x, VALUE y)$/;"	f	file:
+img_insertset	image_conversion.c	/^img_insertset(int argc, VALUE *argv, VALUE obj, VALUE obj2)$/;"	f	file:
+img_invert	image_arithmetic.c	/^img_invert(VALUE obj)$/;"	f
+img_invfft	image_freq_filt.c	/^img_invfft(VALUE obj)$/;"	f
+img_invfftr	image_freq_filt.c	/^img_invfftr(VALUE obj)$/;"	f
+img_kill	image.c	/^img_kill(VALUE obj)$/;"	f	file:
+img_lab_morph	image_colour.c	/^img_lab_morph(VALUE obj, VALUE mask, VALUE l_offset, VALUE l_scale,$/;"	f
+img_lab_to_labq	image_colour.c	/^img_lab_to_labq(VALUE obj)$/;"	f
+img_lab_to_labs	image_colour.c	/^img_lab_to_labs(VALUE obj)$/;"	f
+img_lab_to_lch	image_colour.c	/^img_lab_to_lch(VALUE obj)$/;"	f
+img_lab_to_ucs	image_colour.c	/^img_lab_to_ucs(VALUE obj)$/;"	f
+img_lab_to_xyz	image_colour.c	/^img_lab_to_xyz(VALUE obj)$/;"	f
+img_lab_to_xyz_temp	image_colour.c	/^img_lab_to_xyz_temp(VALUE obj, VALUE x0, VALUE y0, VALUE z0)$/;"	f
+img_label_regions	image_morphology.c	/^img_label_regions(VALUE obj)$/;"	f
+img_labq_to_lab	image_colour.c	/^img_labq_to_lab(VALUE obj)$/;"	f
+img_labq_to_labs	image_colour.c	/^img_labq_to_labs(VALUE obj)$/;"	f
+img_labq_to_xyz	image_colour.c	/^img_labq_to_xyz(VALUE obj)$/;"	f
+img_labs_to_lab	image_colour.c	/^img_labs_to_lab(VALUE obj)$/;"	f
+img_labs_to_labq	image_colour.c	/^img_labs_to_labq(VALUE obj)$/;"	f
+img_lch_to_lab	image_colour.c	/^img_lch_to_lab(VALUE obj)$/;"	f
+img_lch_to_ucs	image_colour.c	/^img_lch_to_ucs(VALUE obj)$/;"	f
+img_less	image_relational.c	/^img_less(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_less_const	image_relational.c	/^img_less_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_less_img	image_relational.c	/^img_less_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_lesseq	image_relational.c	/^img_lesseq(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_lesseq_const	image_relational.c	/^img_lesseq_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_lesseq_img	image_relational.c	/^img_lesseq_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_lhisteq	image_histograms_lut.c	/^img_lhisteq(VALUE obj, VALUE xwin, VALUE ywin)$/;"	f
+img_lin	image_arithmetic.c	/^img_lin(VALUE obj, VALUE a, VALUE b)$/;"	f
+img_lin_mult	image_arithmetic.c	/^img_lin_mult(int argc, VALUE *argv_a, VALUE *argv_b, VALUE obj)$/;"	f	file:
+img_lindetect	image_convolution.c	/^img_lindetect(VALUE obj, VALUE mask)$/;"	f
+img_log	image_arithmetic.c	/^img_log(VALUE obj)$/;"	f
+img_log10	image_arithmetic.c	/^img_log10(VALUE obj)$/;"	f
+img_lrjoin	image_conversion.c	/^img_lrjoin(VALUE obj, VALUE obj2)$/;"	f
+img_lrmerge	image_mosaicing.c	/^img_lrmerge(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_lrmerge1	image_mosaicing.c	/^img_lrmerge1(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_lrmosaic	image_mosaicing.c	/^img_lrmosaic(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_lrmosaic1	image_mosaicing.c	/^img_lrmosaic1(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_maplut	image_histograms_lut.c	/^img_maplut(VALUE obj, VALUE obj2)$/;"	f
+img_mark	image.c	/^img_mark(vipsImg *im)$/;"	f	file:
+img_match_linear	image_resample.c	/^img_match_linear(VALUE obj, VALUE obj2,$/;"	f
+img_match_linear_search	image_resample.c	/^img_match_linear_search(VALUE obj, VALUE obj2,$/;"	f
+img_max	image_arithmetic.c	/^img_max(VALUE obj) {$/;"	f
+img_maxpos	image_arithmetic.c	/^img_maxpos(int argc, VALUE *argv, VALUE obj) {$/;"	f
+img_maxpos_avg	image_arithmetic.c	/^img_maxpos_avg(VALUE obj) {$/;"	f
+img_maxpos_n	image_arithmetic.c	/^img_maxpos_n(VALUE obj, int len) {$/;"	f	file:
+img_maxpos_single	image_arithmetic.c	/^img_maxpos_single(VALUE obj) {$/;"	f	file:
+img_maxpos_subpel	image_mosaicing.c	/^img_maxpos_subpel(VALUE obj)$/;"	f
+img_maxvalue	image_morphology.c	/^img_maxvalue(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_measure_area	image_arithmetic.c	/^img_measure_area(VALUE obj, VALUE left, VALUE top, VALUE width, VALUE height,$/;"	f
+img_min	image_arithmetic.c	/^img_min(VALUE obj) {$/;"	f
+img_minpos	image_arithmetic.c	/^img_minpos(int argc, VALUE *argv, VALUE obj) {$/;"	f
+img_minpos_n	image_arithmetic.c	/^img_minpos_n(VALUE obj, int len) {$/;"	f	file:
+img_minpos_single	image_arithmetic.c	/^img_minpos_single(VALUE obj) {$/;"	f	file:
+img_monotonic_p	image_histograms_lut.c	/^img_monotonic_p(VALUE obj)$/;"	f
+img_more	image_relational.c	/^img_more(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_more_const	image_relational.c	/^img_more_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_more_img	image_relational.c	/^img_more_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_moreeq	image_relational.c	/^img_moreeq(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_moreeq_const	image_relational.c	/^img_moreeq_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_moreeq_img	image_relational.c	/^img_moreeq_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_mpercent	image_histograms_lut.c	/^img_mpercent(VALUE obj, VALUE percent)$/;"	f
+img_mpercent_hist	image_histograms_lut.c	/^img_mpercent_hist(VALUE obj, VALUE percent)$/;"	f
+img_msb	image_conversion.c	/^img_msb(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_multiply	image_arithmetic.c	/^img_multiply(VALUE obj, VALUE obj2)$/;"	f
+img_notequal	image_relational.c	/^img_notequal(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_notequal_const	image_relational.c	/^img_notequal_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_notequal_img	image_relational.c	/^img_notequal_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_or	image_boolean.c	/^img_or(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_or_binop	image_boolean.c	/^img_or_binop(VALUE obj, VALUE arg)$/;"	f
+img_or_const	image_boolean.c	/^img_or_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_or_img	image_boolean.c	/^img_or_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_phasecor_fft	image_freq_filt.c	/^img_phasecor_fft(VALUE obj, VALUE obj2)$/;"	f
+img_pixel_to_rb	image.c	/^img_pixel_to_rb(VipsImage *im, int x, int y)$/;"	f	file:
+img_point	image_arithmetic.c	/^img_point(VALUE obj, VALUE itrp_sym, VALUE x, VALUE y, VALUE band)$/;"	f
+img_pow	image_arithmetic.c	/^img_pow(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_pow_binop	image_arithmetic.c	/^img_pow_binop(VALUE obj, VALUE arg)$/;"	f
+img_profile	image_morphology.c	/^img_profile(VALUE obj, int dir)$/;"	f	file:
+img_profile_h	image_morphology.c	/^img_profile_h(VALUE obj)$/;"	f
+img_profile_v	image_morphology.c	/^img_profile_v(VALUE obj)$/;"	f
+img_project	image_histograms_lut.c	/^img_project(VALUE obj)$/;"	f
+img_rad_to_float	image_colour.c	/^img_rad_to_float(VALUE obj)$/;"	f
+img_rank	image_morphology.c	/^img_rank(VALUE obj, VALUE xsize, VALUE ysize, VALUE order)$/;"	f
+img_rank_image	image_morphology.c	/^img_rank_image(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_rank_image_internal	image_morphology.c	/^img_rank_image_internal(int argc, VALUE *argv, VALUE obj, int index)$/;"	f
+img_recomb	image_arithmetic.c	/^img_recomb(VALUE obj, VALUE recomb)$/;"	f
+img_remainder	image_arithmetic.c	/^img_remainder(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_remainder_binop	image_arithmetic.c	/^img_remainder_binop(VALUE obj, VALUE arg)$/;"	f
+img_remainder_const	image_arithmetic.c	/^img_remainder_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_remainder_img	image_arithmetic.c	/^img_remainder_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_replicate	image_conversion.c	/^img_replicate(VALUE obj, VALUE across, VALUE down)$/;"	f
+img_ri2c	image_conversion.c	/^img_ri2c(VALUE obj, VALUE obj2)$/;"	f
+img_rightshift_size	image_resample.c	/^img_rightshift_size(VALUE obj, VALUE xshift, VALUE yshift, VALUE fmt)$/;"	f
+img_rint	image_arithmetic.c	/^img_rint(VALUE obj)$/;"	f
+img_rot180	image_conversion.c	/^img_rot180(VALUE obj)$/;"	f
+img_rot270	image_conversion.c	/^img_rot270(VALUE obj)$/;"	f
+img_rot90	image_conversion.c	/^img_rot90(VALUE obj)$/;"	f
+img_rotquad	image_freq_filt.c	/^img_rotquad(VALUE obj)$/;"	f
+img_s_black	image_conversion.c	/^img_s_black(VALUE obj, VALUE width, VALUE height, VALUE bands)$/;"	f
+img_s_buildlut	image_histograms_lut.c	/^img_s_buildlut(VALUE obj, VALUE input)$/;"	f
+img_s_fmask_butterworth_bandpass	image_freq_filt.c	/^img_s_fmask_butterworth_bandpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_butterworth_bandreject	image_freq_filt.c	/^img_s_fmask_butterworth_bandreject(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_butterworth_highpass	image_freq_filt.c	/^img_s_fmask_butterworth_highpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_butterworth_lowpass	image_freq_filt.c	/^img_s_fmask_butterworth_lowpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_butterworth_ringpass	image_freq_filt.c	/^img_s_fmask_butterworth_ringpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_butterworth_ringreject	image_freq_filt.c	/^img_s_fmask_butterworth_ringreject(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_fractal_flt	image_freq_filt.c	/^img_s_fmask_fractal_flt(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_gauss_bandpass	image_freq_filt.c	/^img_s_fmask_gauss_bandpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_gauss_bandreject	image_freq_filt.c	/^img_s_fmask_gauss_bandreject(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_gauss_highpass	image_freq_filt.c	/^img_s_fmask_gauss_highpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_gauss_lowpass	image_freq_filt.c	/^img_s_fmask_gauss_lowpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_gauss_ringpass	image_freq_filt.c	/^img_s_fmask_gauss_ringpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_gauss_ringreject	image_freq_filt.c	/^img_s_fmask_gauss_ringreject(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_ideal_bandpass	image_freq_filt.c	/^img_s_fmask_ideal_bandpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_ideal_bandreject	image_freq_filt.c	/^img_s_fmask_ideal_bandreject(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_ideal_highpass	image_freq_filt.c	/^img_s_fmask_ideal_highpass(VALUE obj, VALUE x, VALUE y, VALUE frequency_cutoff)$/;"	f
+img_s_fmask_ideal_highpass	image_freq_filt.c	/^img_s_fmask_ideal_highpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_ideal_lowpass	image_freq_filt.c	/^img_s_fmask_ideal_lowpass(VALUE obj, VALUE x, VALUE y, VALUE frequency_cutoff)$/;"	f
+img_s_fmask_ideal_lowpass	image_freq_filt.c	/^img_s_fmask_ideal_lowpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_ideal_ringpass	image_freq_filt.c	/^img_s_fmask_ideal_ringpass(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fmask_ideal_ringreject	image_freq_filt.c	/^img_s_fmask_ideal_ringreject(VALUE obj, VALUE x, VALUE y,$/;"	f
+img_s_fractsurf	image_freq_filt.c	/^img_s_fractsurf(VALUE obj, VALUE size, VALUE frd)$/;"	f
+img_s_gaussnoise	image_conversion.c	/^img_s_gaussnoise(VALUE obj, VALUE x, VALUE y, VALUE mean, VALUE sigma)$/;"	f
+img_s_identity	image_histograms_lut.c	/^img_s_identity(VALUE obj, VALUE bands)$/;"	f
+img_s_identity_ushort	image_histograms_lut.c	/^img_s_identity_ushort(VALUE obj, VALUE bands, VALUE sz)$/;"	f
+img_s_invertlut	image_histograms_lut.c	/^img_s_invertlut(VALUE obj, VALUE input, VALUE lut_size)$/;"	f
+img_s_linreg	image_arithmetic.c	/^img_s_linreg(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_s_text	image_conversion.c	/^img_s_text(VALUE obj, VALUE text, VALUE font, VALUE width,$/;"	f
+img_s_tone_build	image_histograms_lut.c	/^img_s_tone_build(VALUE obj,$/;"	f
+img_s_tone_build_range	image_histograms_lut.c	/^img_s_tone_build_range(VALUE obj,$/;"	f
+img_scale	image_conversion.c	/^img_scale(VALUE obj)$/;"	f
+img_scaleps	image_conversion.c	/^img_scaleps(VALUE obj)$/;"	f
+img_sharpen	image_convolution.c	/^img_sharpen(VALUE obj, VALUE mask_size, VALUE x1, VALUE y2, VALUE y3, VALUE m1,$/;"	f
+img_shiftleft	image_boolean.c	/^img_shiftleft(VALUE obj, VALUE arg)$/;"	f
+img_shiftright	image_boolean.c	/^img_shiftright(VALUE obj, VALUE arg)$/;"	f
+img_shrink	image_resample.c	/^img_shrink(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_sign	image_arithmetic.c	/^img_sign(VALUE obj)$/;"	f
+img_sin	image_arithmetic.c	/^img_sin(VALUE obj)$/;"	f
+img_spawn	image.c	/^img_spawn(VALUE parent)$/;"	f
+img_spawn2	image.c	/^img_spawn2(VALUE parent1, VALUE parent2)$/;"	f
+img_spawn3	image.c	/^img_spawn3(VALUE parent1, VALUE parent2, VALUE parent3)$/;"	f
+img_spcor	image_convolution.c	/^img_spcor(VALUE obj, VALUE obj2)$/;"	f
+img_srgb_to_xyz	image_colour.c	/^img_srgb_to_xyz(VALUE obj)$/;"	f
+img_stats	image_arithmetic.c	/^img_stats(VALUE obj)$/;"	f
+img_stdif	image_histograms_lut.c	/^img_stdif(VALUE obj,$/;"	f
+img_stretch3	image_resample.c	/^img_stretch3(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_subsample	image_conversion.c	/^img_subsample(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_subtract	image_arithmetic.c	/^img_subtract(VALUE obj, VALUE obj2)$/;"	f
+img_tan	image_arithmetic.c	/^img_tan(VALUE obj)$/;"	f
+img_tbjoin	image_conversion.c	/^img_tbjoin(VALUE obj, VALUE obj2)$/;"	f
+img_tbmerge	image_mosaicing.c	/^img_tbmerge(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_tbmerge1	image_mosaicing.c	/^img_tbmerge1(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_tbmosaic	image_mosaicing.c	/^img_tbmosaic(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_tbmosaic1	image_mosaicing.c	/^img_tbmosaic1(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_tile_cache	image_conversion.c	/^img_tile_cache(VALUE obj, VALUE tile_width, VALUE tile_height, VALUE max_tiles)$/;"	f
+img_to_mask	image_conversion.c	/^img_to_mask(VALUE obj)$/;"	f
+img_tone_analyse	image_histograms_lut.c	/^img_tone_analyse(VALUE obj,$/;"	f
+img_ucs_to_lab	image_colour.c	/^img_ucs_to_lab(VALUE obj)$/;"	f
+img_ucs_to_lch	image_colour.c	/^img_ucs_to_lch(VALUE obj)$/;"	f
+img_ucs_to_xyz	image_colour.c	/^img_ucs_to_xyz(VALUE obj)$/;"	f
+img_vtype	image.c	/^img_vtype(VALUE obj)$/;"	f	file:
+img_vtype_to_id	image.c	/^img_vtype_to_id(VipsType vtype)$/;"	f
+img_wrap	image_conversion.c	/^img_wrap(VALUE obj, VALUE x, VALUE y)$/;"	f
+img_xor	image_boolean.c	/^img_xor(int argc, VALUE *argv, VALUE obj)$/;"	f
+img_xor_binop	image_boolean.c	/^img_xor_binop(VALUE obj, VALUE arg)$/;"	f
+img_xor_const	image_boolean.c	/^img_xor_const(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+img_xor_img	image_boolean.c	/^img_xor_img(VALUE obj, VALUE obj2)$/;"	f	file:
+img_xyz_to_lab	image_colour.c	/^img_xyz_to_lab(VALUE obj)$/;"	f
+img_xyz_to_lab_temp	image_colour.c	/^img_xyz_to_lab_temp(VALUE obj, VALUE x0, VALUE y0, VALUE z0)$/;"	f
+img_xyz_to_srgb	image_colour.c	/^img_xyz_to_srgb(VALUE obj)$/;"	f
+img_xyz_to_ucs	image_colour.c	/^img_xyz_to_ucs(VALUE obj)$/;"	f
+img_xyz_to_yxy	image_colour.c	/^img_xyz_to_yxy(VALUE obj)$/;"	f
+img_yxy_to_xyz	image_colour.c	/^img_yxy_to_xyz(VALUE obj)$/;"	f
+img_zerox	image_morphology.c	/^img_zerox(VALUE obj, int flag)$/;"	f	file:
+img_zerox_neg	image_morphology.c	/^img_zerox_neg(VALUE obj)$/;"	f
+img_zerox_pos	image_morphology.c	/^img_zerox_pos(VALUE obj)$/;"	f
+img_zoom	image_conversion.c	/^img_zoom(int argc, VALUE *argv, VALUE obj)$/;"	f
+in	image.h	/^  VipsImage *in;$/;"	m	struct:_vipsImg
+init_Header	header.c	/^init_Header( void )$/;"	f
+init_Image	image.c	/^init_Image(void)$/;"	f
+init_Image_colour	image_colour.c	/^init_Image_colour()$/;"	f
+init_Image_conversion	image_conversion.c	/^init_Image_conversion()$/;"	f
+init_Image_mosaicing	image_mosaicing.c	/^init_Image_mosaicing(void)$/;"	f
+init_Interpolator	interpolator.c	/^init_Interpolator(void)$/;"	f
+init_Mask	mask.c	/^init_Mask( void )$/;"	f
+init_Reader	reader.c	/^init_Reader(void)$/;"	f
+init_Writer	writer.c	/^init_Writer(void)$/;"	f
+init_vips_library	ruby_vips.c	/^init_vips_library()$/;"	f	file:
+interp_description	interpolator.c	/^interp_description(VALUE obj)$/;"	f	file:
+interp_lookup	interpolator.c	/^interp_lookup(VALUE itrp_sym)$/;"	f
+interp_nickname	interpolator.c	/^interp_nickname(VALUE obj)$/;"	f	file:
+interp_register	interpolator.c	/^interp_register(VipsInterpolateClass *itrp, void *hash)$/;"	f	file:
+interp_register_builtin	interpolator.c	/^interp_register_builtin()$/;"	f	file:
+jpeg_buf_internal	reader.c	/^jpeg_buf_internal(VALUE obj, VALUE buf, VALUE shrink, VALUE fail)$/;"	f	file:
+jpeg_buf_internal	writer.c	/^jpeg_buf_internal(VALUE obj, VALUE quality)$/;"	f	file:
+jpeg_write_internal	writer.c	/^jpeg_write_internal(VALUE obj, VALUE path)$/;"	f	file:
+mVIPS	ruby_vips.c	/^VALUE mVIPS, eVIPSError;$/;"	v
+mVIPSHeader	header.c	/^VALUE mVIPSHeader;$/;"	v
+magick_read_internal	reader.c	/^magick_read_internal(VALUE obj, VALUE path, VALUE flags)$/;"	f	file:
+mask_alloc	mask.c	/^mask_alloc(VALUE klass)$/;"	f
+mask_arg2mask	mask.c	/^mask_arg2mask(VALUE arg, INTMASK **imask, DOUBLEMASK **dmask)$/;"	f
+mask_ary2dmask	mask.c	/^mask_ary2dmask(VALUE coeffs)$/;"	f	file:
+mask_ary2imask	mask.c	/^mask_ary2imask(VALUE coeffs)$/;"	f	file:
+mask_coeff	mask.c	/^mask_coeff(VALUE obj)$/;"	f	file:
+mask_free	mask.c	/^mask_free(vipsMask *msk)$/;"	f	file:
+mask_initialize	mask.c	/^mask_initialize(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+mask_int_p	mask.c	/^mask_int_p(VALUE obj)$/;"	f	file:
+mask_offset	mask.c	/^mask_offset(VALUE obj)$/;"	f	file:
+mask_scale	mask.c	/^mask_scale(VALUE obj)$/;"	f	file:
+mask_to_image	mask.c	/^mask_to_image(VALUE obj)$/;"	f	file:
+mask_xsize	mask.c	/^mask_xsize(VALUE obj)$/;"	f	file:
+mask_ysize	mask.c	/^mask_ysize(VALUE obj)$/;"	f	file:
+png_buf_internal	writer.c	/^png_buf_internal(VALUE obj, VALUE compression, VALUE interlace)$/;"	f	file:
+png_write_internal	writer.c	/^png_write_internal(VALUE obj, VALUE path)$/;"	f	file:
+ppm_write_internal	writer.c	/^ppm_write_internal(VALUE obj, VALUE path)$/;"	f	file:
+raw_read_internal	reader.c	/^raw_read_internal(VALUE obj, VALUE path, VALUE width, VALUE height, VALUE bpp,$/;"	f	file:
+rb_str_new_cstr	ruby_vips.h	28;"	d
+reader_fmt_set	reader.c	/^reader_fmt_set(VALUE klass, const char* val)$/;"	f	file:
+reader_get_fmt_class	reader.c	/^reader_get_fmt_class(VALUE klass)$/;"	f
+reader_read_internal	reader.c	/^reader_read_internal(VALUE obj, VALUE path, VALUE flags)$/;"	f	file:
+reader_s_recognized_p	reader.c	/^reader_s_recognized_p(VALUE klass, VALUE path)$/;"	f	file:
+ruby_vips_class_map_all	ruby_vips.c	/^ruby_vips_class_map_all( GType type, VipsClassMap fn, void *a )$/;"	f
+ruby_vips_type_map	ruby_vips.c	/^ruby_vips_type_map( GType base, VipsTypeMap2 fn, void *a, void *b )$/;"	f	file:
+tiff_write_internal	writer.c	/^tiff_write_internal(VALUE obj, VALUE path)$/;"	f	file:
+vipsImg	image.h	/^typedef struct _vipsImg vipsImg;$/;"	t	typeref:struct:_vipsImg
+vipsMask	mask.h	/^typedef struct _vipsMask vipsMask;$/;"	t	typeref:struct:_vipsMask
+vips_class_map_concrete_all	ruby_vips.h	44;"	d
+vips_lib_error	ruby_vips.c	/^vips_lib_error()$/;"	f
+vips_s_debug_info	ruby_vips.c	/^vips_s_debug_info(VALUE obj)$/;"	f	file:
+vips_s_version_array	ruby_vips.c	/^vips_s_version_array()$/;"	f	file:
+vips_s_version_string	ruby_vips.c	/^vips_s_version_string()$/;"	f	file:
+vips_write_internal	writer.c	/^vips_write_internal(VALUE obj, VALUE path)$/;"	f	file:
+writer_exif_set	writer.c	/^writer_exif_set(VALUE obj, VALUE str)$/;"	f	file:
+writer_icc_set	writer.c	/^writer_icc_set(VALUE obj, VALUE str)$/;"	f	file:
+writer_image	writer.c	/^writer_image(VALUE obj)$/;"	f	file:
+writer_initialize	writer.c	/^writer_initialize(int argc, VALUE *argv, VALUE obj)$/;"	f	file:
+writer_meta_remove	writer.c	/^writer_meta_remove(VALUE obj, const char* name)$/;"	f	file:
+writer_meta_set	writer.c	/^writer_meta_set(VALUE obj, const char* name, VALUE str)$/;"	f	file:
+writer_remove_exif	writer.c	/^writer_remove_exif(VALUE obj)$/;"	f	file:
+writer_remove_icc	writer.c	/^writer_remove_icc(VALUE obj)$/;"	f	file:
+writer_write_internal	writer.c	/^writer_write_internal(VALUE obj, VALUE path)$/;"	f	file:

data/ext/writer.c

@@ -56,7 +56,7 @@ static VALUE
 writer_meta_remove(VALUE obj, const char* name)
 {
     GetImg(obj, data, im);
-#if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 22
+#if ATLEAST_VIPS( 7, 22 )
 	if (im_meta_remove(im, name))
 		return Qfalse;
 #else
@@ -147,8 +147,23 @@ jpeg_buf_internal(VALUE obj, VALUE quality)
 
     GetImg(obj, data, im);
 
+#if ATLEAST_VIPS( 7, 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 ATLEAST_VIPS( 7, 28 )
+    if (vips_pngsave_buffer(im, &buf, &length,
+        "compression", NUM2INT(compression),
+	"interlace", NUM2INT(interlace),
+	NULL))
+        vips_lib_error();
+#elif ATLEAST_VIPS( 7, 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: */

data/lib/vips/reader.rb

@@ -65,7 +65,7 @@ module VIPS
     end
 
     def read
-      str = "#{@path}:#{shrink_factor}"
+      str = "#{@path}:#{@shrink_factor}"
       str << "," 
       str << "fail" if @fail_on_warn
 
@@ -79,6 +79,18 @@ module VIPS
       @_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.
@@ -183,16 +195,23 @@ module VIPS
     end
 
     def read
-      str = "#{@path}:"
+      # some old versions of vips (eg. 7.26) have a bug in the png reader where
+      # the ':' is not tripped from the filename in the ispng test ... only put
+      # the ':' there if we have to
+      str = "#{@path}"
 
       seq = 0
       if VIPS.sequential_mode_supported?
-        str << "sequential" if @sequential
+        str << ":sequential" if @sequential
         seq = 1
       end
 
       @_im = read_retry str, seq
     end
+
+    def read_buffer
+      @_im = buf_internal @path
+    end
   end
 
   class Image

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/ruby-vips.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2013-01-15"
+  s.date = "2013-06-25"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "ext/reader.h",
     "ext/ruby_vips.c",
     "ext/ruby_vips.h",
+    "ext/tags",
     "ext/writer.c",
     "ext/writer.h",
     "lib/vips.rb",
@@ -68,6 +69,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/jcupitt/ruby-vips"
   s.licenses = ["MIT"]
+  s.rdoc_options = ["--title", "ruby-vips \#{version}", "ext"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23"
   s.summary = "ruby-vips is a ruby extension for vips. It is extremely fast and it can process huge images without requiring the entire image to be loaded into memory."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -124,6 +124,7 @@ files:
 - ext/reader.h
 - ext/ruby_vips.c
 - ext/ruby_vips.h
+- ext/tags
 - ext/writer.c
 - ext/writer.h
 - lib/vips.rb
@@ -138,7 +139,10 @@ homepage: http://github.com/jcupitt/ruby-vips
 licenses:
 - MIT
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --title
+- ! 'ruby-vips #{version}'
+- ext
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -149,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3498407689071905375
+      hash: 1280497846562142382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: