ruby-vips 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2446e29083185a98ac3bb6188f4aea09e5e0cd4e
-  data.tar.gz: ef6ef9641798e39418476661573f9227bab6d946
+  metadata.gz: 38b222b12b892a0cfbd9532a25e977c14e20ca4b
+  data.tar.gz: f21db53783fb278d10c03293b3e356a9b22c5bed
 SHA512:
-  metadata.gz: acf05666f8e861380016b9d9e86ec7a3e617964b9c77b72ff5fe284e6c0cbd9f23b9888c5031bc67b522e189047cd6823583fb4bc055b0f73399d286e69f54d5
-  data.tar.gz: 3d699ef4ba6799dd787d4a534cb8858a4c1ed3aa88237825b390e1c746d7e608f4ed8a9e50a2af18de22b8314cc0074a8afbd4fe83f379fc0b9070c4826beb6b
+  metadata.gz: fad99e35598db1433300247d531d4fa6d2fbe82b47ce0ee7d5a9fe1224f28833d83832774db52a8b50de91b65f51e98410eaad7dda55fb76eb1757daa7e3372c
+  data.tar.gz: 784a0f8a3e8b4fcea5688b5c72e8b92d8901ea6ce8aa2c3d3453a660c14815871e008ad010333475748ce88b8102ab9b80e8ff308b0631a82ee8b59fe85e6a8b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## Version 2.0.5 (2017-09-02)
+
+* fix get() with older libvipses
+
 ## Version 2.0.4 (2017-09-02)
 
 * add a test for `get_fields`, since it appeared in libvips 8.5 (thanks zverok)

data/README.md

@@ -51,7 +51,7 @@ which gives some more background.
 It's just:
 
 ```
-	$ gem install ruby-vips
+$ gem install ruby-vips
 ```
 
 or include it in `Gemfile`:

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/lib/vips/image.rb

@@ -33,9 +33,7 @@ module Vips
     # vips_image_get_fields was added in libvips 8.5
     begin
         attach_function :vips_image_get_fields, [:pointer], :pointer
-        HAS_IMAGE_GET_FIELDS = true
     rescue FFI::NotFoundError
-        HAS_IMAGE_GET_FIELDS = false
     end
 
     attach_function :vips_image_set, 
@@ -475,7 +473,19 @@ module Vips
         # @param name [String] Metadata field to fetch
         # @return [Integer] GType
         def get_typeof name
-            Vips::vips_image_get_typeof self, 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
+            end
         end
 
         # Get a metadata item from an image. Ruby types are constructed 
@@ -492,6 +502,16 @@ module Vips
         # @param name [String] Metadata field to get
         # @return [Object] Value of field
         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
+            end
+
             gvalue = GObject::GValue.alloc
             result = Vips::vips_image_get self, name, gvalue
             if result != 0 
@@ -507,7 +527,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::HAS_IMAGE_GET_FIELDS
+            if not Vips.respond_to? :vips_image_get_fields
                 return []
             end
 

data/lib/vips/object.rb

@@ -108,20 +108,24 @@ module Vips
 
         end
 
-        def get_typeof name
+        def get_typeof_property 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
-            raise Vips::Error if result != 0 
+            return 0 if result != 0 
 
             pspec[:value][:value_type]
         end
 
+        def get_typeof name
+            get_typeof_property name 
+        end
+
         def get name
-            gtype = get_typeof name
+            gtype = get_typeof_property name
             gvalue = GObject::GValue.alloc 
             gvalue.init gtype
             GObject::g_object_get_property self, name, gvalue
@@ -135,7 +139,7 @@ module Vips
         def set name, value
             GLib::logger.debug("Vips::Object.set") {"#{name} = #{value}"}
 
-            gtype = get_typeof name
+            gtype = get_typeof_property 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.4"
+    VERSION = "2.0.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - John Cupitt