ruby-vips 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38b222b12b892a0cfbd9532a25e977c14e20ca4b
-  data.tar.gz: f21db53783fb278d10c03293b3e356a9b22c5bed
+  metadata.gz: 977fd4194df253aca0b38025de9dcf563e9050fb
+  data.tar.gz: 6f675830bc3809d3e9b73656607ebc688d8e2cb8
 SHA512:
-  metadata.gz: fad99e35598db1433300247d531d4fa6d2fbe82b47ce0ee7d5a9fe1224f28833d83832774db52a8b50de91b65f51e98410eaad7dda55fb76eb1757daa7e3372c
-  data.tar.gz: 784a0f8a3e8b4fcea5688b5c72e8b92d8901ea6ce8aa2c3d3453a660c14815871e008ad010333475748ce88b8102ab9b80e8ff308b0631a82ee8b59fe85e6a8b
+  metadata.gz: ee2eed6adc45832a11c316b136076df8b6a0d7032b9d96cde61ef2fbd21829022e84f8a9b290df432bd36369914f58d92e2edb4c136f3f96fe4d1c1aeb5ec636
+  data.tar.gz: dc22e1b1fdec424250c77f7a08953d5a77c085e116ee875f29cbba8f71d98b1649199f5c7b6d41bb7fa8aef101be187fec55683d3df43d0b19e358e8e04b2bcc

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## Version 2.0.6 (2017-09-02)
+
+* improve get() behaviour on error with older libvipses
+
 ## Version 2.0.5 (2017-09-02)
 
 * fix get() with older libvipses

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6

data/example/wobble.rb

@@ -8,8 +8,8 @@ module Vips
     class Image
         def wobble
             # this makes an image where pixel (0, 0) (at the top-left) has 
-            # value [0, 0], and pixel (image.width, image.height) at the 
-            # bottom-right has value [image.width, image.height]
+            # value [0, 0], and pixel (image.width - 1, image.height - 1) at the 
+            # bottom-right has value [image.width - 1, image.height - 1]
             index = Vips::Image.xyz width, height 
 
             # make a version with (0, 0) at the centre, negative values up 

data/lib/vips.rb

@@ -546,6 +546,14 @@ module Vips
     attach_function :version, :vips_version, [:int], :int
     attach_function :version_string, :vips_version_string, [], :string
 
+    # True if this is at least libvips x.y
+    def self.at_least_libvips?(x, y)
+        major = version(0)
+        minor = version(1)
+
+        major > x or (major == x and minor >= y)
+    end
+
     LIBRARY_VERSION = Vips::version_string
 
 end

data/lib/vips/image.rb

@@ -51,6 +51,8 @@ module Vips
     # for an introduction to using this class.
 
     class Image < Vips::Object
+        alias_method :parent_get_typeof, :get_typeof
+
         private
 
         # the layout of the VipsImage struct
@@ -473,19 +475,14 @@ module Vips
         # @param name [String] Metadata field to fetch
         # @return [Integer] GType
         def get_typeof name
-            # libvips 8.5+ has a fast path for this
-            if Vips::version(0) > 8 or Vips::version(1) > 4
-                Vips::vips_image_get_typeof self, name
-            else
-                # with older libvips, we have to look in properties first, then
-                # fall back to metadata
-                gtype = get_typeof_property name
-                if gtype != 0
-                    gtype
-                else
-                    Vips::vips_image_get_typeof self, name
-                end
+            # on libvips before 8.5, property types must be searched first,
+            # since vips_image_get_typeof returned built-in enums as int
+            if not Vips::at_least_libvips?(8, 5)
+                gtype = parent_get_typeof name
+                return gtype if gtype != 0
             end
+
+            Vips::vips_image_get_typeof self, name
         end
 
         # Get a metadata item from an image. Ruby types are constructed 
@@ -504,19 +501,13 @@ module Vips
         def get name
             # with old libvips, we must fetch properties (as opposed to
             # metadata) via VipsObject
-            unless Vips::version(0) > 8 or Vips::version(1) > 4
-                gtype = get_typeof_property name
-                if gtype != 0
-                    # found a property
-                    return super
-                end
+            if not Vips::at_least_libvips?(8, 5)
+                return super if parent_get_typeof(name) != 0
             end
 
             gvalue = GObject::GValue.alloc
             result = Vips::vips_image_get self, name, gvalue
-            if result != 0 
-                raise Vips::Error
-            end
+            raise Vips::Error if result != 0 
 
             return gvalue.get
         end
@@ -527,9 +518,7 @@ module Vips
         # @return [[String]] array of field names 
         def get_fields
             # vips_image_get_fields() was added in libvips 8.5
-            if not Vips.respond_to? :vips_image_get_fields
-                return []
-            end
+            return [] if not Vips.respond_to? :vips_image_get_fields
 
             array = Vips::vips_image_get_fields self
 

data/lib/vips/object.rb

@@ -108,24 +108,41 @@ module Vips
 
         end
 
-        def get_typeof_property name
+        # return a pspec, or nil ... nil wil leave a message in the error log
+        # which you must clear
+        def get_pspec name
             pspec = GObject::GParamSpecPtr.new
             argument_class = Vips::ArgumentClassPtr.new
             argument_instance = Vips::ArgumentInstancePtr.new
 
             result = Vips::vips_object_get_argument self, name,
                 pspec, argument_class, argument_instance
-            return 0 if result != 0 
+            return nil if result != 0 
+
+            pspec
+        end
+
+        # return a gtype, raise an error on not found
+        def get_typeof_error name
+            pspec = get_pspec name
+            raise Vips::Error if not pspec
 
             pspec[:value][:value_type]
         end
 
+        # return a gtype, 0 on not found
         def get_typeof name
-            get_typeof_property name 
+            pspec = get_pspec name
+            if not pspec
+                Vips::vips_error_clear 
+                return 0
+            end
+
+            pspec[:value][:value_type]
         end
 
         def get name
-            gtype = get_typeof_property name
+            gtype = get_typeof_error name
             gvalue = GObject::GValue.alloc 
             gvalue.init gtype
             GObject::g_object_get_property self, name, gvalue
@@ -139,7 +156,7 @@ module Vips
         def set name, value
             GLib::logger.debug("Vips::Object.set") {"#{name} = #{value}"}
 
-            gtype = get_typeof_property name
+            gtype = get_typeof_error name
             gvalue = GObject::GValue.alloc 
             gvalue.init gtype
             gvalue.set value

data/lib/vips/version.rb

@@ -1,4 +1,4 @@
 module Vips
-    VERSION = "2.0.5"
+    VERSION = "2.0.6"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - John Cupitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi