ruby-vips 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9313e9659b31e926e6e1e7dcc71d772528c3e9f
-  data.tar.gz: 2f82e18e72ab6c483575cc5c1e30c7e180b2fe7a
+  metadata.gz: fa7ceeea5a7f3ba540d67ff5940b75229c55195b
+  data.tar.gz: 15ab5c034633a329a591b7db148ab5f2de294442
 SHA512:
-  metadata.gz: de582b44a3a7228cae2a585db65914984d0274a7f9db225e0d608aaf9d727620d2177b639262e73af22aab99a82736d4aeab56f29e1eab27152b72110454bcbe
-  data.tar.gz: 1b38ef7ccabcded40a962ab6336ab744ba06e275560515f13e0499133c4d36029e313a3449794f3a939505caf2c6ac07e03b9a0eec952308cf38ac22b46eab91
+  metadata.gz: 7a5f515a544a0a09cd68b4faafe23b5e10d06207855826e5a1a09cf0791a1ebf28ba5f2282a1bdc2301aaa21bab39e160c7a11bb76fbbf36370d7551b0b47f45
+  data.tar.gz: d483450c4931f687a7b219890f0ce49ada8f4a56334718b0c123a60a8cafc27aa3c45d5085cb4c2dd394e3bec037b10ac54e3fc595ea8250ca5188bd2a8030a5

data/.travis.yml

@@ -1,9 +1,16 @@
+sudo: false
+
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
-env:
-  - LIBVIPS=8.4.4
+    - VIPS_VERSION_MAJOR=8
+    - VIPS_VERSION_MINOR=5
+    - VIPS_VERSION_MICRO=3
+    - PATH=$HOME/vips/bin:$PATH
+    - LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH
+    - PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH
+    - PYTHONPATH=$HOME/vips/lib/python2.7/site-packages:$PYTHONPATH
+    - GI_TYPELIB_PATH=$HOME/vips/lib/girepository-1.0:$GI_TYPELIB_PATH
 
 dist: trusty
 
@@ -30,11 +37,19 @@ addons:
       - libwebp-dev
       - libglib2.0-dev
 
+cache:
+  directories:
+    - $HOME/vips
+
+# gobject-introspection 3.1 declares itself as 2.1 minimum, so we can't test
+# 2.0 ... in fact it seems to work if you force it, but I don't think we can do
+# that on travis
 language: ruby
 rvm:
   - 2.1
   - 2.2
   - 2.3
+  - 2.4
 
 script: "bundle exec rake"
 
@@ -43,13 +58,4 @@ gemfile:
 
 before_install:
   - uname -a
-  - sudo apt-get update
-  - wget http://www.vips.ecs.soton.ac.uk/supported/current/vips-$LIBVIPS.tar.gz
-  - tar xvf vips-$LIBVIPS.tar.gz
-  - cd vips-$LIBVIPS
-  - >
-    CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
-    ./configure --prefix=/usr
-  - make
-  - sudo make install
-  - sudo ldconfig
+  - bash install-vips.sh

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # master 
 
+# Version 1.0.5
+
+* fix `_const` for libvips 8.5 [John Cupitt]
+* add `scaleimage`, the scale operation renamed to avoid a clash with the
+  `scale` property [John Cupitt]
+* add `.new_from_image`: make a new image from a constant [John Cupitt]
+* `bandjoin` will use `bandjoin_const`, if it can [John Cupitt]
+* update generated docs for libvips 8.5 [John Cupitt]
+* added docs for new libvips 8.5 enums [John Cupitt]
+
 # Version 1.0.4
 
 * remove stray comma from some docs lines [John Cupitt]

data/README.md

@@ -9,7 +9,7 @@ The older `ruby-vips` is still here and still maintained in branch
 `0.3-stable`.
 
 This gem provides a Ruby binding for the [vips image processing
-library](http://www.vips.ecs.soton.ac.uk). 
+library](https://jcupitt.github.io/libvips).
 
 Programs that use `ruby-vips` don't
 manipulate images directly, instead they create pipelines of image processing
@@ -39,7 +39,7 @@ rmagick.rb      3352020
 ```
 
 See also [benchmarks at the official libvips
-website](http://www.vips.ecs.soton.ac.uk/index.php?title=Speed_and_Memory_Use).
+website](https://github.com/jcupitt/libvips/wiki/Speed-and-memory-use).
 There's a handy blog post explaining [how libvips opens
 files](http://libvips.blogspot.co.uk/2012/06/how-libvips-opens-file.html)
 which gives some more background.
@@ -73,7 +73,7 @@ Check your package manager and see if the libvips on your system is new enough.
 
 If it's too old, you'll need to build libvips from source. 
 Download a tarball from the 
-[libvips website](http://www.vips.ecs.soton.ac.uk/supported/current), or build
+[libvips website](https://jcupitt.github.io/libvips), or build
 from [the git repository](https://github.com/jcupitt/libvips) and see the
 README.
 
@@ -102,7 +102,7 @@ im = Vips::Image.new_from_file filename
 # put im at position (100, 100) in a 3000 x 3000 pixel image, 
 # make the other pixels in the image by mirroring im up / down / 
 # left / right, see
-# http://www.vips.ecs.soton.ac.uk/supported/current/doc/html/libvips/libvips-conversion.html#vips-embed
+# https://jcupitt.github.io/libvips/API/current/libvips-conversion.html#vips-embed
 im = im.embed 100, 100, 3000, 3000, :extend => :mirror
 
 # multiply the green (middle) band by 2, leave the other two alone

data/install-vips.sh

@@ -0,0 +1,26 @@
+#!/bin/bash 
+
+vips_site=https://github.com/jcupitt/libvips/releases/download
+version=$VIPS_VERSION_MAJOR.$VIPS_VERSION_MINOR.$VIPS_VERSION_MICRO
+
+set -e
+
+# do we already have the correct vips built? early exit if yes
+# we could check the configure params as well I guess
+if [ -d "$HOME/vips/bin" ]; then
+	installed_version=$($HOME/vips/bin/vips --version)
+	escaped_version="$VIPS_VERSION_MAJOR\.$VIPS_VERSION_MINOR\.$VIPS_VERSION_MICRO"
+	echo "Need vips-$version"
+	echo "Found $installed_version"
+	if [[ "$installed_version" =~ ^vips-$escaped_version ]]; then
+		echo "Using cached directory"
+		exit 0
+	fi
+fi
+
+rm -rf $HOME/vips
+wget $vips_site/v$version/vips-$version.tar.gz
+tar xf vips-$version.tar.gz
+cd vips-$version
+CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 ./configure --prefix=$HOME/vips $*
+make && make install

data/lib/vips.rb

@@ -121,6 +121,8 @@ module Vips
 
             # TODO get the vips error buffer
             raise error unless succeeded
+
+            log "Vips::Loader.call_init_function: argv = #{argv}"
         end
 
         def define_value_modules
@@ -138,7 +140,7 @@ module Vips
 end
 
 at_exit {
-        Vips::shutdown if Vips.respond_to? :shutdown
+    Vips::shutdown if Vips.respond_to? :shutdown
 }
 
 # this makes vips keep a list of all active objects which we can print out

data/lib/vips/argument.rb

@@ -50,11 +50,7 @@ module Vips
 
             # we have a 1D array ... use that as a pixel constant and expand 
             # to match match_image
-            pixel = (Vips::Image.black(1, 1) + value).cast(match_image.format)
-            pixel = pixel.copy :interpretation => match_image.interpretation,
-                :xres => match_image.xres, :yres =>  match_image.yres
-            pixel.embed(0, 0, match_image.width, match_image.height, 
-                        :extend => :copy)
+            match_image.new_from_image(value)
         end
 
         # @private

data/lib/vips/call.rb

@@ -11,14 +11,13 @@ module Vips
         def initialize(name, supplied_values)
             @name = name
             @supplied_values = supplied_values
+            @optional_values = {}
             @instance = nil
             @option_string = nil
 
             if @supplied_values.last.is_a? Hash
                 @optional_values = @supplied_values.last
-                @supplied_values.delete_at -1
-            else
-                @optional_values = {}
+                @supplied_values.delete_at(-1)
             end
 
             begin
@@ -119,8 +118,11 @@ module Vips
         end
 
         def set_required_input(match_image, required_input)
+            log "set_required_input: @instance = #{@instance}"
+
             # do we have a non-nil instance? set the first image arg with this
             if @instance != nil
+                log "BANANA"
                 log "setting first image arg with instance ..."
                 x = required_input.find do |arg|
                     gtype = GLib::Type["VipsImage"]
@@ -238,6 +240,8 @@ module Vips
         end
 
         def invoke
+            log "invoke starting ..."
+            log "invoke instance is #{@instance}"
             set_string_args()
             match_image = find_match_image()
             required_input, optional_input = find_input()

data/lib/vips/image.rb

@@ -1,5 +1,5 @@
 # This module provides a set of overrides for the [vips image processing 
-# library](http://www.vips.ecs.soton.ac.uk)
+# library](https://jcupitt.github.io/libvips/)
 # used via the [gobject-introspection
 # gem](https://rubygems.org/gems/gobject-introspection). 
 #
@@ -45,7 +45,8 @@
 # but is slower and needs more memory. See {Access}
 # for full details
 # on the various modes available. You can also load formatted images from 
-# memory buffers or create images that wrap C-style memory arrays. 
+# memory buffers, create images that wrap C-style memory arrays, or make images
+# from constants.
 #
 # The next line:
 #
@@ -98,7 +99,7 @@
 # of overrides which try to make it nicer to use. 
 #
 # The API you end up with is a Ruby-ish version of the [VIPS C 
-# API](http://www.vips.ecs.soton.ac.uk/supported/current/doc/html/libvips/). 
+# API](https://jcupitt.github.io/libvips/API/current). 
 # Full documentation
 # on the operations and what they do is there, you can use it directly. This
 # document explains the extra features of the Ruby API and lists the available 
@@ -233,7 +234,7 @@
 # that that operation expects. 
 # 
 # Use the [C API 
-# docs](http://www.vips.ecs.soton.ac.uk/supported/current/doc/html/libvips) 
+# docs](https://jcupitt.github.io/libvips/API/current) 
 # for more detail.
 #
 # # Exceptions
@@ -322,7 +323,7 @@ module Vips
         # handy for overloads ... want to be able to apply a function to an 
         # array or to a scalar
         def self.smap(x, &block)
-            x.is_a?(Array) ? x.map {|x| smap(x, &block)} : block.(x)
+            x.is_a?(Array) ? x.map {|y| smap(y, &block)} : block.(x)
         end
 
         # run a complex operation on a complex image, or an image with an even
@@ -384,6 +385,24 @@ module Vips
             end
         end
 
+        # libvips 8.4 and earlier had a bug which swapped the args to the _const
+        # enum operations
+        def swap_const_args
+            Vips::version(0) < 8 or 
+                (Vips::version(0) == 8 and Vips::version(1) <= 4)
+        end
+
+        # handy for expanding enum operations
+        def call_enum(name, other, enum)
+            if other.is_a?(Vips::Image)
+                Vips::call_base name.to_s, self, "", [other, enum]
+            else
+                args = swap_const_args ? [other, enum] : [enum, other]
+
+                Vips::call_base name.to_s + "_const", self, "", args
+            end
+        end
+
         public
 
         # Invoke a vips operation with {call}, using self as the first 
@@ -392,7 +411,7 @@ module Vips
         # @param name [String] vips operation to call
         # @return result of vips operation
         def method_missing(name, *args)
-            Vips::call_base(name.to_s, self, "", args)
+            Vips::call_base name.to_s, self, "", args
         end
 
         # Invoke a vips operation with {call}.
@@ -556,6 +575,23 @@ module Vips
             return image
         end
 
+        # A new image is created with the same width, height, format,
+        # interpretation, resolution and offset as self, but with every pixel
+        # set to the specified value.
+        #
+        # You can pass an array to make a many-band image, or a single value to
+        # make a one-band image.
+        #
+        # @param pixel [Real, Array<Real>] value to put in each pixel
+        # @return [Image] constant image
+        def new_from_image(value)
+            pixel = (Vips::Image.black(1, 1) + value).cast(format)
+            image = pixel.embed(0, 0, width, height, :extend => :copy)
+            image.copy :interpretation => interpretation,
+                :xres => xres, :yres => yres,
+                :xoffset => xoffset, :yoffset => yoffset
+        end
+
         # Write this image to a file. Save options may be encoded in the
         # filename or given as a hash. For example:
         #
@@ -756,7 +792,8 @@ module Vips
         # @param other [Image, Real, Array<Real>] Thing to add to self
         # @return [Image] result of addition
         def +(other)
-            other.is_a?(Vips::Image) ? add(other) : linear(1, other)
+            other.is_a?(Vips::Image) ? 
+                add(other) : linear(1, other)
         end
 
         # Subtract an image, constant or array. 
@@ -773,7 +810,8 @@ module Vips
         # @param other [Image, Real, Array<Real>] Thing to multiply by self
         # @return [Image] result of multiplication
         def *(other)
-            other.is_a?(Vips::Image) ? multiply(other) : linear(other, 0)
+            other.is_a?(Vips::Image) ? 
+                multiply(other) : linear(other, 0)
         end
 
         # Divide an image, constant or array. 
@@ -799,8 +837,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] self to the power of this
         # @return [Image] result of power
         def **(other)
-            other.is_a?(Vips::Image) ? 
-                math2(other, :pow) : math2_const(other, :pow)
+            call_enum("math2", other, :pow)
         end
 
         # Integer left shift with an image, constant or array. 
@@ -808,8 +845,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] shift left by this much
         # @return [Image] result of left shift
         def <<(other)
-            other.is_a?(Vips::Image) ? 
-                boolean(other, :lshift) : boolean_const(other, :lshift)
+            call_enum("boolean", other, :lshift)
         end
 
         # Integer right shift with an image, constant or array. 
@@ -817,8 +853,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] shift right by this much
         # @return [Image] result of right shift
         def >>(other)
-            other.is_a?(Vips::Image) ? 
-                boolean(other, :rshift) : boolean_const(other, :rshift)
+            call_enum("boolean", other, :rshift)
         end
 
         # Integer bitwise OR with an image, constant or array. 
@@ -826,8 +861,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] bitwise OR with this
         # @return [Image] result of bitwise OR 
         def |(other)
-            other.is_a?(Vips::Image) ? 
-                boolean(other, :or) : boolean_const(other, :or)
+            call_enum("boolean", other, :or)
         end
 
         # Integer bitwise AND with an image, constant or array. 
@@ -835,8 +869,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] bitwise AND with this
         # @return [Image] result of bitwise AND 
         def &(other)
-            other.is_a?(Vips::Image) ? 
-                boolean(other, :and) : boolean_const(other, :and)
+            call_enum("boolean", other, :and)
         end
 
         # Integer bitwise EOR with an image, constant or array. 
@@ -844,8 +877,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] bitwise EOR with this
         # @return [Image] result of bitwise EOR 
         def ^(other)
-            other.is_a?(Vips::Image) ? 
-                boolean(other, :eor) : boolean_const(other, :eor)
+            call_enum("boolean", other, :eor)
         end
 
         # Equivalent to image ^ -1
@@ -879,8 +911,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] relational less than with this
         # @return [Image] result of less than
         def <(other)
-            other.is_a?(Vips::Image) ? 
-                relational(other, :less) : relational_const(other, :less)
+            call_enum("relational", other, :less)
         end
 
         # Relational less than or equal to with an image, constant or array. 
@@ -889,8 +920,7 @@ module Vips
         #   equal to with this
         # @return [Image] result of less than or equal to
         def <=(other)
-            other.is_a?(Vips::Image) ? 
-                relational(other, :lesseq) : relational_const(other, :lesseq)
+            call_enum("relational", other, :lesseq)
         end
 
         # Relational more than with an image, constant or array. 
@@ -898,8 +928,7 @@ module Vips
         # @param other [Image, Real, Array<Real>] relational more than with this
         # @return [Image] result of more than
         def >(other)
-            other.is_a?(Vips::Image) ? 
-                relational(other, :more) : relational_const(other, :more)
+            call_enum("relational", other, :more)
         end
 
         # Relational more than or equal to with an image, constant or array. 
@@ -908,8 +937,7 @@ module Vips
         #   equal to with this
         # @return [Image] result of more than or equal to
         def >=(other)
-            other.is_a?(Vips::Image) ? 
-                relational(other, :moreeq) : relational_const(other, :moreeq)
+            call_enum("relational", other, :moreeq)
         end
 
         # Compare equality to nil, an image, constant or array.
@@ -917,12 +945,11 @@ module Vips
         # @param other [nil, Image, Real, Array<Real>] test equality to this
         # @return [Image] result of equality
         def ==(other)
+            # for equality, we must allow tests against nil
             if other == nil
                 false
-            elsif other.is_a?(Vips::Image)  
-                relational(other, :equal) 
             else
-                relational_const(other, :equal)
+                call_enum("relational", other, :equal)
             end
         end
 
@@ -931,12 +958,11 @@ module Vips
         # @param other [nil, Image, Real, Array<Real>] test inequality to this
         # @return [Image] result of inequality
         def !=(other)
+            # for equality, we must allow tests against nil
             if other == nil
                 true
-            elsif other.is_a?(Vips::Image) 
-                relational(other, :noteq) 
             else
-                relational_const(other, :noteq)
+                call_enum("relational", other, :noteq)
             end
         end
 
@@ -1029,7 +1055,14 @@ module Vips
                 other = [other]
             end
 
-            Vips::Image.bandjoin([self] + other)
+            # if other is just Numeric, we can use bandjoin_const
+            not_all_real = (other.map {|x| not x.is_a?(Numeric)}).include?(true)
+
+            if not_all_real
+                Vips::Image.bandjoin([self] + other)
+            else
+                bandjoin_const(other)
+            end
         end
 
         # Return the coordinates of the image maximum.
@@ -1279,6 +1312,15 @@ module Vips
             Vips::call_base "ifthenelse", self, "", [th, el, opts]
         end
 
+        # Scale an image to uchar. This is the vips `scale` operation, but
+        # renamed to avoid a clash with the `.scale` property.
+        #
+        # @param [Hash] opts Set of options
+        # @return [Vips::Image] Output image
+        def scaleimage(opts = {})
+            Vips::Image.scale self, opts
+        end
+
     end
 
     # This method generates yard comments for all the dynamically bound
@@ -1294,7 +1336,7 @@ module Vips
 
     def self.generate_yard
         # these have hand-written methods, see above
-        no_generate = ["bandjoin", "ifthenelse"]
+        no_generate = ["scale", "bandjoin", "ifthenelse"]
 
         generate_operation = lambda do |op|
             flags = op.flags

data/lib/vips/interesting.rb

@@ -0,0 +1,14 @@
+module Vips
+
+    # Pick the algorithm vips uses to decide image "interestingness". This is 
+    # used by {Image#smartcrop}, for example, to decide what parts of the image 
+    # to keep. 
+    #
+    # * `:none` do nothing
+    # * `:centre` just take the centre
+    # * `:entropy` use an entropy measure
+    # * `:attention` look for features likely to draw human attention
+
+    class Interesting
+    end
+end

data/lib/vips/methods.rb

@@ -117,10 +117,10 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
-# @!method relational_const(c, relational, opts = {})
+# @!method relational_const(relational, c, opts = {})
 #   Relational operations against a constant.
-#   @param c [Array<Double>] Array of constants
 #   @param relational [Vips::OperationRelational] relational to perform
+#   @param c [Array<Double>] Array of constants
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
@@ -130,17 +130,17 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
-# @!method boolean_const(c, boolean, opts = {})
+# @!method boolean_const(boolean, c, opts = {})
 #   Boolean operations against a constant.
-#   @param c [Array<Double>] Array of constants
 #   @param boolean [Vips::OperationBoolean] boolean to perform
+#   @param c [Array<Double>] Array of constants
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
-# @!method math2_const(c, math2, opts = {})
+# @!method math2_const(math2, c, opts = {})
 #   Binary math operations with a constant.
-#   @param c [Array<Double>] Array of constants
 #   @param math2 [Vips::OperationMath2] math to perform
+#   @param c [Array<Double>] Array of constants
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
@@ -292,9 +292,7 @@ module Vips
 # @!method sequential(opts = {})
 #   Check sequential access.
 #   @param [Hash] opts Set of options
-#   @option opts [Boolean] :trace trace pixel requests
 #   @option opts [Integer] :tile_height Tile height in pixels
-#   @option opts [Vips::Access] :access Expected access pattern
 #   @return [Vips::Image] Output image
 
 # @!method cache(opts = {})
@@ -313,7 +311,7 @@ module Vips
 #   @param height [Integer] Image height in pixels
 #   @param [Hash] opts Set of options
 #   @option opts [Vips::Extend] :extend How to generate the extra pixels
-#   @option opts [Array<Double>] :background Colour for background pixels
+#   @option opts [Array<Double>] :background Color for background pixels
 #   @return [Vips::Image] Output image
 
 # @!method flip(direction, opts = {})
@@ -329,7 +327,7 @@ module Vips
 #   @param y [Integer] Top edge of sub in main
 #   @param [Hash] opts Set of options
 #   @option opts [Boolean] :expand Expand output to hold all of both inputs
-#   @option opts [Array<Double>] :background Colour for new pixels
+#   @option opts [Array<Double>] :background Color for new pixels
 #   @return [Vips::Image] Output image
 
 # @!method join(in2, direction, opts = {})
@@ -337,10 +335,10 @@ module Vips
 #   @param in2 [Vips::Image] Second input image
 #   @param direction [Vips::Direction] Join left-right or up-down
 #   @param [Hash] opts Set of options
-#   @option opts [Vips::Align] :align Align on the low, centre or high coordinate edge
 #   @option opts [Boolean] :expand Expand output to hold all of both inputs
 #   @option opts [Integer] :shim Pixels between images
 #   @option opts [Array<Double>] :background Colour for new pixels
+#   @option opts [Vips::Align] :align Align on the low, centre or high coordinate edge
 #   @return [Vips::Image] Output image
 
 # @!method self.arrayjoin(in, opts = {})
@@ -374,6 +372,14 @@ module Vips
 #   @param [Hash] opts Set of options
 #   @return [Vips::Image] Output image
 
+# @!method smartcrop(width, height, opts = {})
+#   Extract an area from an image.
+#   @param width [Integer] Width of extract area
+#   @param height [Integer] Height of extract area
+#   @param [Hash] opts Set of options
+#   @option opts [Vips::Interesting] :interesting How to measure interestingness
+#   @return [Vips::Image] Output image
+
 # @!method extract_band(band, opts = {})
 #   Extract band from an image.
 #   @param band [Integer] Band to extract
@@ -1406,7 +1412,7 @@ module Vips
 #   @option opts [Integer] :height Size to this height
 #   @option opts [Vips::Size] :size Only upsize, only downsize, or both
 #   @option opts [Boolean] :auto_rotate Use orientation tags to rotate image upright
-#   @option opts [Boolean] :crop Reduce to fill target rectangle, then crop
+#   @option opts [Vips::Interesting] :crop Reduce to fill target rectangle, then crop
 #   @option opts [Boolean] :linear Reduce in linear light
 #   @option opts [String] :import_profile Fallback import profile
 #   @option opts [String] :export_profile Fallback export profile
@@ -1420,7 +1426,7 @@ module Vips
 #   @option opts [Integer] :height Size to this height
 #   @option opts [Vips::Size] :size Only upsize, only downsize, or both
 #   @option opts [Boolean] :auto_rotate Use orientation tags to rotate image upright
-#   @option opts [Boolean] :crop Reduce to fill target rectangle, then crop
+#   @option opts [Vips::Interesting] :crop Reduce to fill target rectangle, then crop
 #   @option opts [Boolean] :linear Reduce in linear light
 #   @option opts [String] :import_profile Fallback import profile
 #   @option opts [String] :export_profile Fallback export profile
@@ -1527,7 +1533,7 @@ module Vips
 # @!method Lab2XYZ(opts = {})
 #   Transform cielab to xyz.
 #   @param [Hash] opts Set of options
-#   @option opts [Array<Double>] :temp Colour temperature
+#   @option opts [Array<Double>] :temp Color temperature
 #   @return [Vips::Image] Output image
 
 # @!method XYZ2Lab(opts = {})
@@ -1909,7 +1915,7 @@ module Vips
 
 # @!method draw_rect(ink, left, top, width, height, opts = {})
 #   Paint a rectangle on an image.
-#   @param ink [Array<Double>] Colour for pixels
+#   @param ink [Array<Double>] Color for pixels
 #   @param left [Integer] Rect to fill
 #   @param top [Integer] Rect to fill
 #   @param width [Integer] Rect to fill
@@ -1920,7 +1926,7 @@ module Vips
 
 # @!method draw_mask(ink, mask, x, y, opts = {})
 #   Draw a mask on an image.
-#   @param ink [Array<Double>] Colour for pixels
+#   @param ink [Array<Double>] Color for pixels
 #   @param mask [Vips::Image] Mask of pixels to draw
 #   @param x [Integer] Draw mask here
 #   @param y [Integer] Draw mask here
@@ -1929,7 +1935,7 @@ module Vips
 
 # @!method draw_line(ink, x1, y1, x2, y2, opts = {})
 #   Draw a line on an image.
-#   @param ink [Array<Double>] Colour for pixels
+#   @param ink [Array<Double>] Color for pixels
 #   @param x1 [Integer] Start of draw_line
 #   @param y1 [Integer] Start of draw_line
 #   @param x2 [Integer] End of draw_line
@@ -1939,7 +1945,7 @@ module Vips
 
 # @!method draw_circle(ink, cx, cy, radius, opts = {})
 #   Draw a circle on an image.
-#   @param ink [Array<Double>] Colour for pixels
+#   @param ink [Array<Double>] Color for pixels
 #   @param cx [Integer] Centre of draw_circle
 #   @param cy [Integer] Centre of draw_circle
 #   @param radius [Integer] Radius in pixels
@@ -1949,7 +1955,7 @@ module Vips
 
 # @!method draw_flood(ink, x, y, opts = {})
 #   Flood-fill an area.
-#   @param ink [Array<Double>] Colour for pixels
+#   @param ink [Array<Double>] Color for pixels
 #   @param x [Integer] DrawFlood start point
 #   @param y [Integer] DrawFlood start point
 #   @param [Hash] opts Set of options

data/lib/vips/size.rb

@@ -0,0 +1,12 @@
+module Vips
+
+    # Controls whether an operation should upsize, downsize, or both up and
+    # downsize. 
+    #
+    # * `:both` size both up and down
+    # * `:up` only upsize
+    # * `:down` only downsize
+
+    class Size
+    end
+end

data/lib/vips/version.rb

@@ -1,4 +1,4 @@
 module Vips
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - John Cupitt
@@ -138,6 +138,7 @@ files:
 - example/trim8.rb
 - example/watermark.rb
 - example/wobble.rb
+- install-vips.sh
 - lib/vips.rb
 - lib/vips/access.rb
 - lib/vips/align.rb
@@ -153,11 +154,13 @@ files:
 - lib/vips/extend.rb
 - lib/vips/foreignflags.rb
 - lib/vips/image.rb
+- lib/vips/interesting.rb
 - lib/vips/interpolate.rb
 - lib/vips/interpretation.rb
 - lib/vips/kernel.rb
 - lib/vips/methods.rb
 - lib/vips/operation.rb
+- lib/vips/size.rb
 - lib/vips/version.rb
 - ruby-vips.gemspec
 homepage: http://github.com/jcupitt/ruby-vips
@@ -180,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby extension for the vips image processing library.