ruby-vips 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c23989cf3757459c2ac719af2ace562ba8fbb290
-  data.tar.gz: 4445f4c2deb1c2ce58ad8afdb2ed17ba9c8010cb
+SHA256:
+  metadata.gz: e509c29533461f0e4654d1dd116f61b033d589d9f78924bd197cb303fc0d9d0e
+  data.tar.gz: bf53c311ee52c198b3288e6b11d773dda21403355b3704ecbc4652ce16d51d53
 SHA512:
-  metadata.gz: 6fdc125a6e0748faad5db660d7c411cc9350a1f976f3ea63ecf92e5ce3d2eb0d7fa2200e788d52be5b672dc4a4f7482a43b0da1f0aea37e482e7f4da75f4bee5
-  data.tar.gz: 06dcd680d0affffbf36268218f239ac5fc1a9282d2e3a75cbd667082c5715c1b37db5f476e53f312069cbe137b881adfb62fced83d6ce1ef15cd832ead93d288
+  metadata.gz: 7fcdf3c4f3d66ac3550d17bc45606831a3337a41d8b5af151ff6103bdf0e891036e9ff568930e29f3e045543719801e48ec938310809c4e98af2f4f7ac695031
+  data.tar.gz: 2ddd68fe1e1f9dcc2174757658d145d5d9777a18c27436758030e376049e956860f6b5d454fe2f1dc1728b17b27cbcf37e1fa3d301edee23a9a7b17f4d0ba874

data/.travis.yml

@@ -1,40 +1,36 @@
+dist: trusty
 sudo: false
 
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
     - VIPS_VERSION_MAJOR=8
-    - VIPS_VERSION_MINOR=5
-    - VIPS_VERSION_MICRO=7
+    - VIPS_VERSION_MINOR=6
+    - VIPS_VERSION_MICRO=4
     - PATH=$HOME/vips/bin:$PATH
     - LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH
     - PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH
 
-dist: trusty
-
 addons:
   apt:
     packages:
       - libexpat1-dev
       - gettext
+      - libglib2.0-dev
+      - liborc-0.4-dev
+      - libfftw3-dev
       - liblcms2-dev
       - libmagickwand-dev
       - libopenexr-dev
       - libcfitsio3-dev
       - libgif-dev
-      - libgs-dev
       - libgsf-1-dev
       - libmatio-dev
       - libopenslide-dev
-      - liborc-0.4-dev
       - libpango1.0-dev
       - libpoppler-glib-dev
       - librsvg2-dev
       - libwebp-dev
-        # missing on trusty, unfortunately
-        # - libwebpmux2
-      - libfftw3-dev
-      - libglib2.0-dev
 
 cache:
   directories:
@@ -56,4 +52,4 @@ gemfile:
 
 before_install:
   - uname -a
-  - bash install-vips.sh --without-python
+  - bash install-vips.sh 

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## Version 2.0.13 (2018-8-6)
+
+* allow optional args to have `nil` as a value [janko-m]
+* fix five small memleaks [kleisauke]
+
 ## Version 2.0.12 (2018-4-25)
 
 * fix `Vips::Image#has_alpha?` with older libvips [larskanis]

data/VERSION

@@ -1 +1 @@
-2.0.12
+2.0.13

data/lib/vips/image.rb

@@ -14,8 +14,8 @@ module Vips
 
     attach_function :vips_image_copy_memory, [:pointer], :pointer
 
-    attach_function :vips_filename_get_filename, [:string], :string
-    attach_function :vips_filename_get_options, [:string], :string
+    attach_function :vips_filename_get_filename, [:string], :pointer
+    attach_function :vips_filename_get_options, [:string], :pointer
 
     attach_function :vips_foreign_find_load, [:string], :string
     attach_function :vips_foreign_find_save, [:string], :string
@@ -52,6 +52,12 @@ module Vips
 
     attach_function :nickname_find, :vips_nickname_find, [:GType], :string
 
+    # turn a raw pointer that must be freed into a self-freeing Ruby string
+    def self.p2str(pointer)
+        pointer = FFI::AutoPointer.new(pointer, GLib::G_FREE)
+        pointer.read_string
+    end
+
     public
 
     # This class represents a libvips image. See the {Vips} module documentation
@@ -250,8 +256,8 @@ module Vips
             # pass this
             raise Vips::Error, "filename is nil" if name == nil
 
-            filename = Vips::vips_filename_get_filename name
-            option_string = Vips::vips_filename_get_options name
+            filename = Vips::p2str(Vips::vips_filename_get_filename name)
+            option_string = Vips::p2str(Vips::vips_filename_get_options name)
             loader = Vips::vips_foreign_find_load filename
             raise Vips::Error if loader == nil
 
@@ -412,15 +418,15 @@ module Vips
         #
         # @param name [String] filename to write to
         def write_to_file name, opts = {}
-            filename = Vips::vips_filename_get_filename name
-            option_string = Vips::vips_filename_get_options name
+            filename = Vips::p2str(Vips::vips_filename_get_filename name)
+            option_string = Vips::p2str(Vips::vips_filename_get_options name)
             saver = Vips::vips_foreign_find_save filename
             if saver == nil
                 raise Vips::Error, "No known saver for '#{filename}'."
             end
 
             Vips::Operation.call saver, [self, filename], opts, option_string
-
+ 
             write_gc
         end
 
@@ -450,8 +456,10 @@ module Vips
         # @macro vips.saveopts
         # @return [String] the image saved in the specified format
         def write_to_buffer format_string, opts = {}
-            filename = Vips::vips_filename_get_filename format_string
-            option_string = Vips::vips_filename_get_options format_string
+            filename = 
+                Vips::p2str(Vips::vips_filename_get_filename format_string)
+            option_string = 
+                Vips::p2str(Vips::vips_filename_get_options format_string)
             saver = Vips::vips_foreign_find_save_buffer filename
             if saver == nil
                 raise Vips::Error, "No known saver for '#{filename}'."

data/lib/vips/operation.rb

@@ -316,6 +316,8 @@ module Vips
 
             # set all optional inputs
             optional.each do |key, value|
+                next if value.nil?
+
                 arg_name = key.to_s
 
                 if optional_input.has_key? arg_name

data/lib/vips/version.rb

@@ -1,4 +1,4 @@
 module Vips
-    VERSION = "2.0.12"
+    VERSION = "2.0.13"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - John Cupitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby extension for the vips image processing library.