ruby-vips 1.0.2 → 1.0.3

data/lib/vips/image.rb

@@ -70,7 +70,7 @@
 # {Image.new_from_array} creates an image from an array constant. The 8 at
 # the end sets the scale: the amount to divide the image by after 
 # integer convolution. See the libvips API docs for `vips_conv()` (the operation
-# invoked by {Vips::Image.conv}) for details on the convolution operator. 
+# invoked by {Image#conv}) for details on the convolution operator. 
 #
 # Finally:
 #
@@ -78,7 +78,7 @@
 # im.write_to_file ARGV[1]
 # ```
 #
-# {Vips::Image.write_to_file} writes an image back to the filesystem. It can 
+# {Image#write_to_file} writes an image back to the filesystem. It can 
 # write any format supported by vips: the file type is set from the filename 
 # suffix. You can also write formatted images to memory buffers, or dump 
 # image data to a raw memory array. 
@@ -108,7 +108,7 @@
 #
 # `ruby-vips` adds a {Image.method_missing} handler to {Image} and uses
 # it to look up vips operations. For example, the libvips operation `add`, which
-# appears in C as `vips_add()`, appears in Ruby as {Vips::Image.add}. 
+# appears in C as `vips_add()`, appears in Ruby as {Image#add}. 
 #
 # The operation's list of required arguments is searched and the first input 
 # image is set to the value of `self`. Operations which do not take an input 
@@ -120,7 +120,7 @@
 # produces several results. If the operation has optional output objects, they
 # are returned as a final hash.
 #
-# For example, {Vips::Image.min}, the vips operation that searches an image for 
+# For example, {Image#min}, the vips operation that searches an image for 
 # the minimum value, has a large number of optional arguments. You can use it to
 # find the minimum value like this:
 #
@@ -137,7 +137,7 @@
 # ```
 #
 # Now `x_pos` and `y_pos` will have the coordinates of the minimum value. 
-# There's actually a convenience function for this, {Vips::Image.minpos}.
+# There's actually a convenience function for this, {Image#minpos}.
 #
 # You can also ask for the top *n* minimum, for example:
 #
@@ -162,7 +162,7 @@
 #
 # libvips types are also automatically wrapped. The override looks at the type 
 # of argument required by the operation and converts the value you supply, 
-# when it can. For example, {Vips::Image.linear} takes a `VipsArrayDouble` as 
+# when it can. For example, {Image#linear} takes a `VipsArrayDouble` as 
 # an argument 
 # for the set of constants to use for multiplication. You can supply this 
 # value as an integer, a float, or some kind of compound object and it 
@@ -175,7 +175,7 @@
 # result_image = image.linear 1, [4, 5, 6] 
 # ```
 #
-# And so on. A set of overloads are defined for {Vips::Image.linear}, see below.
+# And so on. A set of overloads are defined for {Image#linear}, see below.
 #
 # It does a couple of more ambitious conversions. It will automatically convert
 # to and from the various vips types, like `VipsBlob` and `VipsArrayImage`. For
@@ -189,7 +189,7 @@
 #
 # If an operation takes several input images, you can use a constant for all but
 # one of them and the wrapper will expand the constant to an image for you. For
-# example, {Vips::Image.ifthenelse} uses a condition image to pick pixels 
+# example, {Image#ifthenelse} uses a condition image to pick pixels 
 # between a then and an else image:
 #
 # ```ruby
@@ -206,7 +206,7 @@
 #
 # Will make an image where true pixels are green and false pixels are red.
 #
-# This is useful for {Vips::Image.bandjoin}, the thing to join two or more 
+# This is useful for {Image#bandjoin}, the thing to join two or more 
 # images up bandwise. You can write:
 #
 # ```ruby
@@ -230,7 +230,7 @@
 # The bulk of these API docs are generated automatically by 
 # {Vips::generate_yard}. It examines
 # libvips and writes a summary of each operation and the arguments and options
-# that operation expects. 
+# that that operation expects. 
 # 
 # Use the [C API 
 # docs](http://www.vips.ecs.soton.ac.uk/supported/current/doc/html/libvips) 
@@ -240,10 +240,31 @@
 #
 # The wrapper spots errors from vips operations and raises the {Vips::Error}
 # exception. You can catch it in the usual way. 
+#
+# # Enums
+#
+# The libvips enums, such as `VipsBandFormat` appear in ruby-vips as classes
+# like {Vips::BandFormat}. Overloads let you manipulate them in the obvious 
+# way. For example:
+#
+# ```ruby
+# irb(main):002:0> im = Vips::Image.new_from_file "IMG_1867.JPG"
+# => #<Vips::Image:0x13e9760 ptr=0x1a88010>
+# irb(main):003:0> im.format
+# => #<Vips::BandFormat uchar>
+# irb(main):004:0> im.format == :uchar
+# => true
+# irb(main):005:0> im.format == "uchar"
+# => true
+# irb(main):007:0> im.format == 0
+# => true
+# ```
+#
+# The `0` is the C value of the enum. 
 # 
 # # Draw operations
 #
-# Paint operations like {Vips::Image.draw_circle} and {Vips::Image.draw_line}
+# Paint operations like {Image#draw_circle} and {Image#draw_line}
 # modify their input image. This
 # makes them hard to use with the rest of libvips: you need to be very careful
 # about the order in which operations execute or you can get nasty crashes.
@@ -270,7 +291,7 @@
 # # Expansions
 #
 # Some vips operators take an enum to select an action, for example 
-# {Vips::Image.math} can be used to calculate sine of every pixel like this:
+# {Image#math} can be used to calculate sine of every pixel like this:
 #
 # ```ruby
 # result_image = image.math :sin
@@ -286,9 +307,9 @@
 # # Convenience functions
 #
 # The wrapper defines a few extra useful utility functions: 
-# {Vips::Image.get_value}, {Vips::Image.set_value}, {Vips::Image.bandsplit}, 
-# {Vips::Image.maxpos}, {Vips::Image.minpos}, 
-# {Vips::Image.median}.
+# {Image#get_value}, {Image#set_value}, {Image#bandsplit}, 
+# {Image#maxpos}, {Image#minpos}, 
+# {Image#median}.
 
 module Vips
 
@@ -721,6 +742,13 @@ module Vips
             set name, value
         end
 
+        # Get the image size. 
+        #
+        # @return [Integer, Integer] image width and height
+        def size
+            [width, height]
+        end
+
         # Add an image, constant or array. 
         #
         # @param other [Image, Real, Array<Real>] Thing to add to self
@@ -1256,9 +1284,11 @@ module Vips
     #
     # Regenerate with something like: 
     #
-    #   ruby > methods.rb
-    #   require 'vips'; Vips::generate_yard
-    #   ^D
+    # ```
+    # $ ruby > methods.rb
+    # require 'vips'; Vips::generate_yard
+    # ^D
+    # ```
 
     def self.generate_yard
         # these have hand-written methods, see above

data/lib/vips/interpolate.rb

@@ -1,7 +1,7 @@
 module Vips
 
     # An interpolator. One of these can be given to operations like 
-    # {Vips::affine} or {Vips::mapim} to select the type of pixel interpolation
+    # {Image#affine} or {Image#mapim} to select the type of pixel interpolation
     # to use.
     #
     # To see all interpolators supported by your
@@ -23,7 +23,7 @@ module Vips
     #  For example:
     #
     #  ```ruby
-    #  im = im.affine :interpolate => Vips::Interpolate.new :bicubic
+    #  im = im.affine [2, 0, 0, 2], :interpolate => Vips::Interpolate.new(:bicubic)
     #  ```
 
     class Interpolate

data/lib/vips/kernel.rb

@@ -0,0 +1,22 @@
+module Vips
+
+    # A resizing kernel. One of these can be given to operations like 
+    # {Image#reduceh} or {Image#resize} to select the resizing kernel to use. 
+    #
+    # At least these should be available:
+    #
+    # *   `:nearest` Nearest-neighbour interpolation.
+    # *   `:linear` Linear interpolation.
+    # *   `:cubic` Cubic interpolation.
+    # *   `:lanczos2` Two-lobe Lanczos
+    # *   `:lanczos3` Three-lobe Lanczos
+    #
+    #  For example:
+    #
+    #  ```ruby
+    #  im = im.resize 3, :kernel => :lanczos2
+    #  ```
+
+    class Kernel
+    end
+end

data/lib/vips/methods.rb

@@ -8,8 +8,8 @@ module Vips
 #   @option opts [Array<Image>] :in Array of input images
 #   @option opts [String] :in_format Format for input filename
 #   @option opts [String] :out_format Format for output filename
-#   @option opts [Vips::Image] :out Output -- Output image
-#   @option opts [String] :log Output -- Command log
+#   @option opts [Vips::Image] :out Output Output image
+#   @option opts [String] :log Output Command log
 #   @return [nil, Hash<Symbol => Object>] Hash of optional output items
 
 # @!method add(right, opts = {})
@@ -165,22 +165,22 @@ module Vips
 #   Find image minimum.
 #   @param [Hash] opts Set of options
 #   @option opts [Integer] :size Number of minimum values to find
-#   @option opts [Integer] :x Output -- Horizontal position of minimum
-#   @option opts [Integer] :y Output -- Vertical position of minimum
-#   @option opts [Array<Double>] :out_array Output -- Array of output values
-#   @option opts [Array<Integer>] :x_array Output -- Array of horizontal positions
-#   @option opts [Array<Integer>] :y_array Output -- Array of vertical positions
+#   @option opts [Integer] :x Output Horizontal position of minimum
+#   @option opts [Integer] :y Output Vertical position of minimum
+#   @option opts [Array<Double>] :out_array Output Array of output values
+#   @option opts [Array<Integer>] :x_array Output Array of horizontal positions
+#   @option opts [Array<Integer>] :y_array Output Array of vertical positions
 #   @return [Float, Hash<Symbol => Object>] Output value, Hash of optional output items
 
 # @!method max(, opts = {})
 #   Find image maximum.
 #   @param [Hash] opts Set of options
 #   @option opts [Integer] :size Number of maximum values to find
-#   @option opts [Integer] :x Output -- Horizontal position of maximum
-#   @option opts [Integer] :y Output -- Vertical position of maximum
-#   @option opts [Array<Double>] :out_array Output -- Array of output values
-#   @option opts [Array<Integer>] :x_array Output -- Array of horizontal positions
-#   @option opts [Array<Integer>] :y_array Output -- Array of vertical positions
+#   @option opts [Integer] :x Output Horizontal position of maximum
+#   @option opts [Integer] :y Output Vertical position of maximum
+#   @option opts [Array<Double>] :out_array Output Array of output values
+#   @option opts [Array<Integer>] :x_array Output Array of horizontal positions
+#   @option opts [Array<Integer>] :y_array Output Array of vertical positions
 #   @return [Float, Hash<Symbol => Object>] Output value, Hash of optional output items
 
 # @!method deviate(, opts = {})
@@ -434,7 +434,7 @@ module Vips
 # @!method autorot(, opts = {})
 #   Autorotate image by exif tag.
 #   @param [Hash] opts Set of options
-#   @option opts [Vips::Angle] :angle Output -- Angle image was rotated by
+#   @option opts [Vips::Angle] :angle Output Angle image was rotated by
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method recomb(m, opts = {})
@@ -554,7 +554,7 @@ module Vips
 #   Make a text image.
 #   @param text [String] Text to render
 #   @param [Hash] opts Set of options
-#   @option opts [String] :font Font to render width
+#   @option opts [String] :font Font to render with
 #   @option opts [Integer] :width Maximum image width in pixels
 #   @option opts [Vips::Align] :align Align on the low, centre or high edge
 #   @option opts [Integer] :dpi DPI to render at
@@ -631,9 +631,9 @@ module Vips
 #   @param frequency_cutoff [Float] Frequency cutoff
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
-#   @option opts [Boolean] :nodc Remove DC component
-#   @option opts [Boolean] :reject Invert the sense of the filter
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
+#   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_ideal_ring(width, height, frequency_cutoff, ringwidth, opts = {})
@@ -644,9 +644,9 @@ module Vips
 #   @param ringwidth [Float] Ringwidth
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
-#   @option opts [Boolean] :nodc Remove DC component
-#   @option opts [Boolean] :reject Invert the sense of the filter
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
+#   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_ideal_band(width, height, frequency_cutoff_x, frequency_cutoff_y, radius, opts = {})
@@ -659,8 +659,8 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
-#   @option opts [Boolean] :nodc Remove DC component
 #   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_butterworth(width, height, order, frequency_cutoff, amplitude_cutoff, opts = {})
@@ -673,8 +673,8 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
-#   @option opts [Boolean] :nodc Remove DC component
 #   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_butterworth_ring(width, height, order, frequency_cutoff, amplitude_cutoff, ringwidth, opts = {})
@@ -688,8 +688,8 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
-#   @option opts [Boolean] :nodc Remove DC component
 #   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_butterworth_band(width, height, order, frequency_cutoff_x, frequency_cutoff_y, radius, amplitude_cutoff, opts = {})
@@ -716,9 +716,9 @@ module Vips
 #   @param amplitude_cutoff [Float] Amplitude cutoff
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
-#   @option opts [Boolean] :nodc Remove DC component
-#   @option opts [Boolean] :reject Invert the sense of the filter
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
+#   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_gaussian_ring(width, height, frequency_cutoff, amplitude_cutoff, ringwidth, opts = {})
@@ -731,8 +731,8 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
-#   @option opts [Boolean] :nodc Remove DC component
 #   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_gaussian_band(width, height, frequency_cutoff_x, frequency_cutoff_y, radius, amplitude_cutoff, opts = {})
@@ -746,8 +746,8 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
-#   @option opts [Boolean] :nodc Remove DC component
 #   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method self.mask_fractal(width, height, fractal_dimension, opts = {})
@@ -757,9 +757,9 @@ module Vips
 #   @param fractal_dimension [Float] Fractal dimension
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :uchar Output an unsigned char image
-#   @option opts [Boolean] :nodc Remove DC component
-#   @option opts [Boolean] :reject Invert the sense of the filter
 #   @option opts [Boolean] :optical Rotate quadrants to optical space
+#   @option opts [Boolean] :reject Invert the sense of the filter
+#   @option opts [Boolean] :nodc Remove DC component
 #   @return [Vips::Image] Output image
 
 # @!method buildlut(, opts = {})
@@ -804,23 +804,22 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
-# @!method self.radload(filename, opts = {})
-#   Load a radiance image from a file.
-#   @param filename [String] Filename to load from
+# @!method self.worley(width, height, opts = {})
+#   Make a worley noise image.
+#   @param width [Integer] Image width in pixels
+#   @param height [Integer] Image height in pixels
 #   @param [Hash] opts Set of options
-#   @option opts [Boolean] :disc Open to disc
-#   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
-#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+#   @option opts [Integer] :cell_size Size of Worley cells
+#   @return [Vips::Image] Output image
 
-# @!method self.ppmload(filename, opts = {})
-#   Load ppm from file.
-#   @param filename [String] Filename to load from
+# @!method self.perlin(width, height, opts = {})
+#   Make a perlin noise image.
+#   @param width [Integer] Image width in pixels
+#   @param height [Integer] Image height in pixels
 #   @param [Hash] opts Set of options
-#   @option opts [Boolean] :disc Open to disc
-#   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
-#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+#   @option opts [Integer] :cell_size Size of Perlin cells
+#   @option opts [Boolean] :uchar Output an unsigned char image
+#   @return [Vips::Image] Output image
 
 # @!method self.csvload(filename, opts = {})
 #   Load csv from file.
@@ -832,7 +831,7 @@ module Vips
 #   @option opts [Integer] :lines Read this many lines from the file
 #   @option opts [String] :whitespace Set of whitespace characters
 #   @option opts [String] :separator Set of separator characters
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.matrixload(filename, opts = {})
@@ -841,16 +840,7 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
-#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
-
-# @!method self.analyzeload(filename, opts = {})
-#   Load an analyze6 image.
-#   @param filename [String] Filename to load from
-#   @param [Hash] opts Set of options
-#   @option opts [Boolean] :disc Open to disc
-#   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.rawload(filename, width, height, bands, opts = {})
@@ -863,7 +853,7 @@ module Vips
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
 #   @option opts [Integer] :offset Offset in bytes from start of file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.vipsload(filename, opts = {})
@@ -872,7 +862,102 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.analyzeload(filename, opts = {})
+#   Load an analyze6 image.
+#   @param filename [String] Filename to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.ppmload(filename, opts = {})
+#   Load ppm from file.
+#   @param filename [String] Filename to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.radload(filename, opts = {})
+#   Load a radiance image from a file.
+#   @param filename [String] Filename to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.pdfload(filename, opts = {})
+#   Load pdf with libpoppler.
+#   @param filename [String] Filename to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Integer] :page Load this page from the file
+#   @option opts [Integer] :n Load this many pages
+#   @option opts [Float] :dpi Render at this DPI
+#   @option opts [Float] :scale Scale output by this factor
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.pdfload_buffer(buffer, opts = {})
+#   Load pdf with libpoppler.
+#   @param buffer [Vips::Blob] Buffer to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Integer] :page Load this page from the file
+#   @option opts [Integer] :n Load this many pages
+#   @option opts [Float] :dpi Render at this DPI
+#   @option opts [Float] :scale Scale output by this factor
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.svgload(filename, opts = {})
+#   Load svg with rsvg.
+#   @param filename [String] Filename to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Float] :dpi Render at this DPI
+#   @option opts [Float] :scale Scale output by this factor
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.svgload_buffer(buffer, opts = {})
+#   Load svg with rsvg.
+#   @param buffer [Vips::Blob] Buffer to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Float] :dpi Render at this DPI
+#   @option opts [Float] :scale Scale output by this factor
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.gifload(filename, opts = {})
+#   Load gif with giflib.
+#   @param filename [String] Filename to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Integer] :page Load this page from the file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
+#   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
+
+# @!method self.gifload_buffer(buffer, opts = {})
+#   Load gif with giflib.
+#   @param buffer [Vips::Blob] Buffer to load from
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :disc Open to disc
+#   @option opts [Vips::Access] :access Required access pattern for this file
+#   @option opts [Integer] :page Load this page from the file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.pngload(filename, opts = {})
@@ -881,7 +966,7 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.pngload_buffer(buffer, opts = {})
@@ -890,7 +975,7 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.matload(filename, opts = {})
@@ -899,7 +984,7 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.jpegload(filename, opts = {})
@@ -911,7 +996,7 @@ module Vips
 #   @option opts [Integer] :shrink Shrink factor on load
 #   @option opts [Boolean] :fail Fail on first warning
 #   @option opts [Boolean] :autorotate Rotate image using exif orientation
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.jpegload_buffer(buffer, opts = {})
@@ -923,7 +1008,7 @@ module Vips
 #   @option opts [Integer] :shrink Shrink factor on load
 #   @option opts [Boolean] :fail Fail on first warning
 #   @option opts [Boolean] :autorotate Rotate image using exif orientation
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.webpload(filename, opts = {})
@@ -932,7 +1017,8 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Integer] :shrink Shrink factor on load
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.webpload_buffer(buffer, opts = {})
@@ -941,7 +1027,8 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Integer] :shrink Shrink factor on load
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.tiffload(filename, opts = {})
@@ -951,7 +1038,8 @@ module Vips
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
 #   @option opts [Integer] :page Load this page from the image
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Boolean] :autorotate Rotate image using orientation tag
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.tiffload_buffer(buffer, opts = {})
@@ -961,7 +1049,8 @@ module Vips
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
 #   @option opts [Integer] :page Load this page from the image
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Boolean] :autorotate Rotate image using orientation tag
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.openslideload(filename, opts = {})
@@ -973,7 +1062,7 @@ module Vips
 #   @option opts [Integer] :level Load this level from the file
 #   @option opts [Boolean] :autocrop Crop to image bounds
 #   @option opts [String] :associated Load this associated image
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.magickload(filename, opts = {})
@@ -982,9 +1071,10 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :all_frames Read all frames from an image
 #   @option opts [String] :density Canvas resolution for rendering vector formats like SVG
+#   @option opts [Integer] :page Load this page from the file
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.magickload_buffer(buffer, opts = {})
@@ -993,9 +1083,10 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :all_frames Read all frames from an image
 #   @option opts [String] :density Canvas resolution for rendering vector formats like SVG
+#   @option opts [Integer] :page Load this page from the file
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.fitsload(filename, opts = {})
@@ -1004,7 +1095,7 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method self.openexrload(filename, opts = {})
@@ -1013,27 +1104,9 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :disc Open to disc
 #   @option opts [Vips::Access] :access Required access pattern for this file
-#   @option opts [Vips::ForeignFlags] :flags Output -- Flags for this file
+#   @option opts [Vips::ForeignFlags] :flags Output Flags for this file
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
-# @!method radsave(filename, opts = {})
-#   Save image to radiance file.
-#   @param filename [String] Filename to save to
-#   @param [Hash] opts Set of options
-#   @option opts [Boolean] :strip Strip all metadata from image
-#   @option opts [Array<Double>] :background Background value
-#   @return [nil] 
-
-# @!method ppmsave(filename, opts = {})
-#   Save image to ppm file.
-#   @param filename [String] Filename to save to
-#   @param [Hash] opts Set of options
-#   @option opts [Boolean] :ascii save as ascii
-#   @option opts [Boolean] :squash save as one bit
-#   @option opts [Boolean] :strip Strip all metadata from image
-#   @option opts [Array<Double>] :background Background value
-#   @return [nil] 
-
 # @!method csvsave(filename, opts = {})
 #   Save image to csv file.
 #   @param filename [String] Filename to save to
@@ -1082,6 +1155,31 @@ module Vips
 #   @option opts [Array<Double>] :background Background value
 #   @return [nil] 
 
+# @!method ppmsave(filename, opts = {})
+#   Save image to ppm file.
+#   @param filename [String] Filename to save to
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :ascii save as ascii
+#   @option opts [Boolean] :squash save as one bit
+#   @option opts [Boolean] :strip Strip all metadata from image
+#   @option opts [Array<Double>] :background Background value
+#   @return [nil] 
+
+# @!method radsave(filename, opts = {})
+#   Save image to radiance file.
+#   @param filename [String] Filename to save to
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :strip Strip all metadata from image
+#   @option opts [Array<Double>] :background Background value
+#   @return [nil] 
+
+# @!method radsave_buffer(, opts = {})
+#   Save image to radiance buffer.
+#   @param [Hash] opts Set of options
+#   @option opts [Boolean] :strip Strip all metadata from image
+#   @option opts [Array<Double>] :background Background value
+#   @return [Vips::Blob] Buffer to save to
+
 # @!method dzsave(filename, opts = {})
 #   Save image to deep zoom format.
 #   @param filename [String] Filename to save to
@@ -1090,11 +1188,12 @@ module Vips
 #   @option opts [String] :suffix Filename suffix for tiles
 #   @option opts [Integer] :overlap Tile overlap in pixels
 #   @option opts [Integer] :tile_size Tile size in pixels
-#   @option opts [Boolean] :centre Center image in tile
 #   @option opts [Vips::ForeignDzDepth] :depth Pyramid depth
+#   @option opts [Boolean] :centre Center image in tile
 #   @option opts [Vips::Angle] :angle Rotate image during save
 #   @option opts [Vips::ForeignDzContainer] :container Pyramid container type
 #   @option opts [Boolean] :properties Write a properties file to the output directory
+#   @option opts [Integer] :compression ZIP deflate compression level
 #   @option opts [Boolean] :strip Strip all metadata from image
 #   @option opts [Array<Double>] :background Background value
 #   @return [nil] 
@@ -1134,6 +1233,7 @@ module Vips
 #   @option opts [Boolean] :trellis_quant Apply trellis quantisation to each 8x8 block
 #   @option opts [Boolean] :overshoot_deringing Apply overshooting to samples with extreme values
 #   @option opts [Boolean] :optimize_scans Split the spectrum of DCT coefficients into separate scans
+#   @option opts [Integer] :quant_table Use predefined quantization table with given index
 #   @option opts [Boolean] :strip Strip all metadata from image
 #   @option opts [Array<Double>] :background Background value
 #   @return [nil] 
@@ -1149,6 +1249,7 @@ module Vips
 #   @option opts [Boolean] :trellis_quant Apply trellis quantisation to each 8x8 block
 #   @option opts [Boolean] :overshoot_deringing Apply overshooting to samples with extreme values
 #   @option opts [Boolean] :optimize_scans Split the spectrum of DCT coefficients into separate scans
+#   @option opts [Integer] :quant_table Use predefined quantization table with given index
 #   @option opts [Boolean] :strip Strip all metadata from image
 #   @option opts [Array<Double>] :background Background value
 #   @return [Vips::Blob] Buffer to save to
@@ -1164,6 +1265,7 @@ module Vips
 #   @option opts [Boolean] :trellis_quant Apply trellis quantisation to each 8x8 block
 #   @option opts [Boolean] :overshoot_deringing Apply overshooting to samples with extreme values
 #   @option opts [Boolean] :optimize_scans Split the spectrum of DCT coefficients into separate scans
+#   @option opts [Integer] :quant_table Use predefined quantization table with given index
 #   @option opts [Boolean] :strip Strip all metadata from image
 #   @option opts [Array<Double>] :background Background value
 #   @return [nil] 
@@ -1174,6 +1276,10 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Integer] :Q Q factor
 #   @option opts [Boolean] :lossless enable lossless compression
+#   @option opts [Vips::ForeignWebpPreset] :preset Preset for lossy compression
+#   @option opts [Boolean] :smart_subsample Enable high quality chroma subsampling
+#   @option opts [Boolean] :near_lossless Enable preprocessing in lossless mode (uses Q)
+#   @option opts [Integer] :alpha_q Change alpha plane fidelity for lossy compression
 #   @option opts [Boolean] :strip Strip all metadata from image
 #   @option opts [Array<Double>] :background Background value
 #   @return [nil] 
@@ -1183,6 +1289,10 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Integer] :Q Q factor
 #   @option opts [Boolean] :lossless enable lossless compression
+#   @option opts [Vips::ForeignWebpPreset] :preset Preset for lossy compression
+#   @option opts [Boolean] :smart_subsample Enable high quality chroma subsampling
+#   @option opts [Boolean] :near_lossless Enable preprocessing in lossless mode (uses Q)
+#   @option opts [Integer] :alpha_q Change alpha plane fidelity for lossy compression
 #   @option opts [Boolean] :strip Strip all metadata from image
 #   @option opts [Array<Double>] :background Background value
 #   @return [Vips::Blob] Buffer to save to
@@ -1199,8 +1309,8 @@ module Vips
 #   @option opts [Integer] :tile_width Tile width in pixels
 #   @option opts [Integer] :tile_height Tile height in pixels
 #   @option opts [Boolean] :pyramid Write a pyramidal tiff
-#   @option opts [Boolean] :miniswhite Use 0 for white in 1-bit images
 #   @option opts [Boolean] :squash Squash images down to 1 bit
+#   @option opts [Boolean] :miniswhite Use 0 for white in 1-bit images
 #   @option opts [Vips::ForeignTiffResunit] :resunit Resolution unit
 #   @option opts [Float] :xres Horizontal resolution in pixels/mm
 #   @option opts [Float] :yres Vertical resolution in pixels/mm
@@ -1225,30 +1335,45 @@ module Vips
 #   @option opts [Vips::Interpolate] :interpolate Interpolate pixels with this
 #   @return [Vips::Image] Output image
 
-# @!method shrink(xshrink, yshrink, opts = {})
+# @!method shrink(hshrink, vshrink, opts = {})
 #   Shrink an image.
-#   @param xshrink [Float] Horizontal shrink factor
-#   @param yshrink [Float] Vertical shrink factor
+#   @param hshrink [Float] Horizontal shrink factor
+#   @param vshrink [Float] Vertical shrink factor
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
-# @!method shrinkh(xshrink, opts = {})
+# @!method shrinkh(hshrink, opts = {})
 #   Shrink an image horizontally.
-#   @param xshrink [Integer] Horizontal shrink factor
+#   @param hshrink [Integer] Horizontal shrink factor
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
-# @!method shrinkv(yshrink, opts = {})
+# @!method shrinkv(vshrink, opts = {})
 #   Shrink an image vertically.
-#   @param yshrink [Integer] Vertical shrink factor
+#   @param vshrink [Integer] Vertical shrink factor
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
-# @!method shrink2(xshrink, yshrink, opts = {})
-#   Shrink an image.
-#   @param xshrink [Float] Horizontal shrink factor
-#   @param yshrink [Float] Vertical shrink factor
+# @!method reduceh(hshrink, opts = {})
+#   Shrink an image horizontally.
+#   @param hshrink [Float] Horizontal shrink factor
 #   @param [Hash] opts Set of options
+#   @option opts [Vips::Kernel] :kernel Resampling kernel
+#   @return [Vips::Image] Output image
+
+# @!method reducev(vshrink, opts = {})
+#   Shrink an image vertically.
+#   @param vshrink [Float] Vertical shrink factor
+#   @param [Hash] opts Set of options
+#   @option opts [Vips::Kernel] :kernel Resampling kernel
+#   @return [Vips::Image] Output image
+
+# @!method reduce(hshrink, vshrink, opts = {})
+#   Reduce an image.
+#   @param hshrink [Float] Horizontal shrink factor
+#   @param vshrink [Float] Vertical shrink factor
+#   @param [Hash] opts Set of options
+#   @option opts [Vips::Kernel] :kernel Resampling kernel
 #   @return [Vips::Image] Output image
 
 # @!method quadratic(coeff, opts = {})
@@ -1286,10 +1411,8 @@ module Vips
 #   Resize an image.
 #   @param scale [Float] Scale image by this factor
 #   @param [Hash] opts Set of options
-#   @option opts [Vips::Interpolate] :interpolate Interpolate pixels with this
+#   @option opts [Vips::Kernel] :kernel Resampling kernel
 #   @option opts [Float] :vscale Vertical scale image by this factor
-#   @option opts [Float] :idx Horizontal input displacement
-#   @option opts [Float] :idy Vertical input displacement
 #   @return [Vips::Image] Output image
 
 # @!method colourspace(space, opts = {})
@@ -1409,8 +1532,8 @@ module Vips
 # @!method icc_import(, opts = {})
 #   Import from device with icc profile.
 #   @param [Hash] opts Set of options
-#   @option opts [Vips::PCS] :pcs Set Profile Connection Space
 #   @option opts [Vips::Intent] :intent Rendering intent
+#   @option opts [Vips::PCS] :pcs Set Profile Connection Space
 #   @option opts [Boolean] :embedded Use embedded input profile, if available
 #   @option opts [String] :input_profile Filename to load input profile from
 #   @return [Vips::Image] Output image
@@ -1418,8 +1541,8 @@ module Vips
 # @!method icc_export(, opts = {})
 #   Output to device with icc profile.
 #   @param [Hash] opts Set of options
-#   @option opts [Vips::PCS] :pcs Set Profile Connection Space
 #   @option opts [Vips::Intent] :intent Rendering intent
+#   @option opts [Vips::PCS] :pcs Set Profile Connection Space
 #   @option opts [String] :output_profile Filename to load output profile from
 #   @option opts [Integer] :depth Output device space depth in bits
 #   @return [Vips::Image] Output image
@@ -1428,8 +1551,8 @@ module Vips
 #   Transform between devices with icc profiles.
 #   @param output_profile [String] Filename to load output profile from
 #   @param [Hash] opts Set of options
-#   @option opts [Vips::PCS] :pcs Set Profile Connection Space
 #   @option opts [Vips::Intent] :intent Rendering intent
+#   @option opts [Vips::PCS] :pcs Set Profile Connection Space
 #   @option opts [Boolean] :embedded Use embedded input profile, if available
 #   @option opts [String] :input_profile Filename to load input profile from
 #   @option opts [Integer] :depth Output device space depth in bits
@@ -1489,9 +1612,9 @@ module Vips
 #   @param height [Integer] Window height in pixels
 #   @param [Hash] opts Set of options
 #   @option opts [Float] :a Weight of new mean
-#   @option opts [Float] :s0 New deviation
-#   @option opts [Float] :b Weight of new deviation
 #   @option opts [Float] :m0 New mean
+#   @option opts [Float] :b Weight of new deviation
+#   @option opts [Float] :s0 New deviation
 #   @return [Vips::Image] Output image
 
 # @!method hist_cum(, opts = {})
@@ -1547,6 +1670,26 @@ module Vips
 #   @option opts [Integer] :cluster Cluster lines closer than this in approximation
 #   @return [Vips::Image] Output image
 
+# @!method conva(mask, opts = {})
+#   Approximate integer convolution.
+#   @param mask [Vips::Image] Input matrix image
+#   @param [Hash] opts Set of options
+#   @option opts [Integer] :layers Use this many layers in approximation
+#   @option opts [Integer] :cluster Cluster lines closer than this in approximation
+#   @return [Vips::Image] Output image
+
+# @!method convf(mask, opts = {})
+#   Float convolution operation.
+#   @param mask [Vips::Image] Input matrix image
+#   @param [Hash] opts Set of options
+#   @return [Vips::Image] Output image
+
+# @!method convi(mask, opts = {})
+#   Int convolution operation.
+#   @param mask [Vips::Image] Input matrix image
+#   @param [Hash] opts Set of options
+#   @return [Vips::Image] Output image
+
 # @!method compass(mask, opts = {})
 #   Convolve with rotating mask.
 #   @param mask [Vips::Image] Input matrix image
@@ -1568,6 +1711,13 @@ module Vips
 #   @option opts [Integer] :cluster Cluster lines closer than this in approximation
 #   @return [Vips::Image] Output image
 
+# @!method convasep(mask, opts = {})
+#   Approximate separable integer convolution.
+#   @param mask [Vips::Image] Input matrix image
+#   @param [Hash] opts Set of options
+#   @option opts [Integer] :layers Use this many layers in approximation
+#   @return [Vips::Image] Output image
+
 # @!method fastcor(ref, opts = {})
 #   Fast correlation.
 #   @param ref [Vips::Image] Input reference image
@@ -1583,7 +1733,7 @@ module Vips
 # @!method sharpen(, opts = {})
 #   Unsharp masking for print.
 #   @param [Hash] opts Set of options
-#   @option opts [Integer] :radius Mask radius
+#   @option opts [Float] :sigma Sigma of Gaussian
 #   @option opts [Float] :x1 Flat/jaggy threshold
 #   @option opts [Float] :y2 Maximum brightening
 #   @option opts [Float] :y3 Maximum darkening
@@ -1651,7 +1801,7 @@ module Vips
 # @!method labelregions(, opts = {})
 #   Label regions in an image.
 #   @param [Hash] opts Set of options
-#   @option opts [Integer] :segments Output -- Number of discrete contigious regions
+#   @option opts [Integer] :segments Output Number of discrete contigious regions
 #   @return [Vips::Image, Hash<Symbol => Object>] Mask of region labels, Hash of optional output items
 
 # @!method draw_rect(ink, left, top, width, height, opts = {})
@@ -1702,10 +1852,10 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @option opts [Vips::Image] :test Test pixels in this image
 #   @option opts [Boolean] :equal DrawFlood while equal to edge
-#   @option opts [Integer] :left Output -- Left edge of modified area
-#   @option opts [Integer] :top Output -- top edge of modified area
-#   @option opts [Integer] :width Output -- width of modified area
-#   @option opts [Integer] :height Output -- height of modified area
+#   @option opts [Integer] :left Output Left edge of modified area
+#   @option opts [Integer] :top Output top edge of modified area
+#   @option opts [Integer] :width Output width of modified area
+#   @option opts [Integer] :height Output height of modified area
 #   @return [Vips::Image, Hash<Symbol => Object>] Image to draw on, Hash of optional output items
 
 # @!method draw_image(sub, x, y, opts = {})
@@ -1749,12 +1899,12 @@ module Vips
 #   @option opts [Integer] :harea Half area size
 #   @option opts [Integer] :mblend Maximum blend size
 #   @option opts [Integer] :bandno Band to search for features on
-#   @option opts [Integer] :dx0 Output -- Detected integer offset
-#   @option opts [Integer] :dy0 Output -- Detected integer offset
-#   @option opts [Float] :scale1 Output -- Detected scale
-#   @option opts [Float] :angle1 Output -- Detected rotation
-#   @option opts [Float] :dx1 Output -- Detected first-order displacement
-#   @option opts [Float] :dy1 Output -- Detected first-order displacement
+#   @option opts [Integer] :dx0 Output Detected integer offset
+#   @option opts [Integer] :dy0 Output Detected integer offset
+#   @option opts [Float] :scale1 Output Detected scale
+#   @option opts [Float] :angle1 Output Detected rotation
+#   @option opts [Float] :dx1 Output Detected first-order displacement
+#   @option opts [Float] :dy1 Output Detected first-order displacement
 #   @return [Vips::Image, Hash<Symbol => Object>] Output image, Hash of optional output items
 
 # @!method mosaic1(sec, direction, xr1, yr1, xs1, ys1, xr2, yr2, xs2, ys2, opts = {})