vips 8.8.4 → 8.12.1

data/example/inheritance_with_refcount.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 
-require 'ffi'
-require 'forwardable'
+require "ffi"
+require "forwardable"
 
 # this is really very crude logging
 
@@ -29,7 +29,7 @@ end
 
 module GLib
   extend FFI::Library
-  ffi_lib 'gobject-2.0'
+  ffi_lib "gobject-2.0"
 
   def self.set_log_domain(_domain)
     # FIXME: this needs hooking up
@@ -68,8 +68,8 @@ module GLib
       def self.included(base)
         base.class_eval do
           layout :g_type_instance, :pointer,
-                 :ref_count, :uint,
-                 :qdata, :pointer
+            :ref_count, :uint,
+            :qdata, :pointer
         end
       end
     end
@@ -85,7 +85,7 @@ module GLib
 
       def self.release(ptr)
         log "GLib::GObject::ManagedStruct.release: unreffing #{ptr}"
-        GLib::g_object_unref(ptr) unless ptr.null?
+        GLib.g_object_unref(ptr) unless ptr.null?
       end
     end
 
@@ -116,7 +116,7 @@ module GLib
 
     class << self
       def ffi_struct
-        self.const_get(:Struct)
+        const_get(:Struct)
       end
     end
 
@@ -127,24 +127,32 @@ module GLib
 
     class << self
       def ffi_managed_struct
-        self.const_get(:ManagedStruct)
+        const_get(:ManagedStruct)
       end
     end
   end
 
-  # :gtype will usually be 64-bit, but will be 32-bit on 32-bit Windows
-  typedef :ulong, :GType
+  # we can't just use ulong, windows has different int sizing rules
+  if FFI::Platform::ADDRESS_SIZE == 64
+    typedef :uint64, :GType
+  else
+    typedef :uint32, :GType
+  end
 end
 
 module Vips
   extend FFI::Library
-  ffi_lib 'vips'
+  ffi_lib "vips"
 
   LOG_DOMAIN = "VIPS"
-  GLib::set_log_domain(LOG_DOMAIN)
+  GLib.set_log_domain(LOG_DOMAIN)
 
   # need to repeat this
-  typedef :ulong, :GType
+  if FFI::Platform::ADDRESS_SIZE == 64
+    typedef :uint64, :GType
+  else
+    typedef :uint32, :GType
+  end
 
   attach_function :vips_init, [:string], :int
   attach_function :vips_shutdown, [], :void
@@ -153,19 +161,19 @@ module Vips
   attach_function :vips_error_clear, [], :void
 
   def self.get_error
-    errstr = Vips::vips_error_buffer
-    Vips::vips_error_clear
+    errstr = Vips.vips_error_buffer
+    Vips.vips_error_clear
     errstr
   end
 
-  if Vips::vips_init($0) != 0
-    puts Vips::get_error
+  if Vips.vips_init($0) != 0
+    puts Vips.get_error
     exit 1
   end
 
-  at_exit {
-    Vips::vips_shutdown
-  }
+  at_exit do
+    Vips.vips_shutdown
+  end
 
   attach_function :vips_object_print_all, [], :void
   attach_function :vips_leak_set, [:int], :void
@@ -188,15 +196,15 @@ module Vips
         base.class_eval do
           # don't actually need most of these, remove them later
           layout :parent, GLib::GObject::Struct,
-             :constructed, :int,
-             :static_object, :int,
-             :argument_table, :pointer,
-             :nickname, :string,
-             :description, :string,
-             :preclose, :int,
-             :close, :int,
-             :postclose, :int,
-             :local_memory, :size_t
+            :constructed, :int,
+            :static_object, :int,
+            :argument_table, :pointer,
+            :nickname, :string,
+            :description, :string,
+            :preclose, :int,
+            :close, :int,
+            :postclose, :int,
+            :local_memory, :size_t
         end
       end
     end
@@ -250,7 +258,7 @@ module Vips
     end
 
     def self.new_partial
-      VipsImage.new(Vips::vips_image_new)
+      VipsImage.new(Vips.vips_image_new)
     end
   end
 
@@ -258,12 +266,11 @@ module Vips
 end
 
 puts "creating image"
-begin
-  x = Vips::VipsImage.new_partial
-  puts "x = #{x}"
-  puts ""
-  puts "x[:parent] = #{x[:parent]}"
-  puts ""
-  puts "x[:parent][:description] = #{x[:parent][:description]}"
-  puts ""
-end
+
+x = Vips::VipsImage.new_partial
+puts "x = #{x}"
+puts ""
+puts "x[:parent] = #{x[:parent]}"
+puts ""
+puts "x[:parent][:description] = #{x[:parent][:description]}"
+puts ""

data/example/progress.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/ruby
+
+require "vips"
+
+image = Vips::Image.black 1, 100000
+image.set_progress true
+
+def progress_to_s(name, progress)
+  puts "#{name}:"
+  puts "    progress.run = #{progress[:run]}"
+  puts "    progress.eta = #{progress[:eta]}"
+  puts "    progress.tpels = #{progress[:tpels]}"
+  puts "    progress.npels = #{progress[:npels]}"
+  puts "    progress.percent = #{progress[:percent]}"
+end
+
+image.signal_connect :preeval do |progress|
+  progress_to_s("preeval", progress)
+end
+
+image.signal_connect :eval do |progress|
+  progress_to_s("eval", progress)
+  image.set_kill(true) if progress[:percent] > 50
+end
+
+image.signal_connect :posteval do |progress|
+  progress_to_s("posteval", progress)
+end
+
+image.avg

data/example/thumb.rb

@@ -1,25 +1,25 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby
 
 # batch-process a lot of files
 #
 # this should run in constant memory -- if it doesn't, something has broken
 
-require 'vips'
+require "vips"
 
 # benchmark thumbnail via a memory buffer
 def via_memory(filename, thumbnail_width)
   data = IO.binread(filename)
 
-  thumb = Vips::Image.thumbnail_buffer data, thumbnail_width, crop: 'centre'
+  thumb = Vips::Image.thumbnail_buffer data, thumbnail_width, crop: "centre"
 
-  thumb.write_to_buffer '.jpg'
+  thumb.write_to_buffer ".jpg"
 end
 
 # benchmark thumbnail via files
 def via_files(filename, thumbnail_width)
-  thumb = Vips::Image.thumbnail filename, thumbnail_width, crop: 'centre'
+  thumb = Vips::Image.thumbnail filename, thumbnail_width, crop: "centre"
 
-  thumb.write_to_buffer '.jpg'
+  thumb.write_to_buffer ".jpg"
 end
 
 ARGV.each do |filename|

data/example/trim8.rb

@@ -7,7 +7,7 @@
 # non-zero row or column is the object edge. We make the mask image with an
 # amount-different-from-background image plus a threshold.
 
-require 'vips'
+require "vips"
 
 im = Vips::Image.new_from_file ARGV[0]
 

data/example/watermark.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/ruby
 
-require 'vips'
+require "vips"
 
 im = Vips::Image.new_from_file ARGV[0], access: :sequential
 
 # make the text mask
-text = Vips::Image.text ARGV[2], width: 200, dpi: 200, font: 'sans bold'
+text = Vips::Image.text ARGV[2], width: 200, dpi: 200, font: "sans bold"
 text = text.rotate(-45)
 # make the text transparent
 text = (text * 0.3).cast(:uchar)

data/example/wobble.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-require 'vips'
+require "vips"
 
 image = Vips::Image.new_from_file ARGV[0]
 

data/lib/vips/blend_mode.rb

@@ -1,31 +1,35 @@
 module Vips
   # Blend mode to use when compositing images. See {Image#composite}.
   #
-  # `:clear` - where the second object is drawn, the first is removed
-  # `:source` - the second object is drawn as if nothing were below
-  # `:over` - the image shows what you would expect if you held two semi-transparent slides on top of each other
-  # `:in` - the first object is removed completely, the second is only drawn where the first was
-  # `:out` - the second is drawn only where the first isn't
-  # `:atop` - this leaves the first object mostly intact, but mixes both objects in the overlapping area
-  # `:dest` - leaves the first object untouched, the second is discarded completely
-  # `:dest_over` - like `:over`, but swaps the arguments
-  # `:dest_in` - like `:in`, but swaps the arguments
-  # `:dest_out` - like `:out`, but swaps the arguments
-  # `:dest_atop` - like `:atop`, but swaps the arguments
-  # `:xor` - something like a difference operator
-  # `:add` - a bit like adding the two images
-  # `:saturate` - a bit like the darker of the two
-  # `:multiply` - at least as dark as the darker of the two inputs
-  # `:screen` - at least as light as the lighter of the inputs
-  # `:overlay` - multiplies or screens colors, depending on the lightness
-  # `:darken` - the darker of each component
-  # `:lighten` - the lighter of each component
-  # `:colour_dodge` - brighten first by a factor second
-  # `:colour_burn` - darken first by a factor of second
-  # `:hard_light` - multiply or screen, depending on lightness
-  # `:soft_light` - darken or lighten, depending on lightness
-  # `:difference` - difference of the two
-  # `:exclusion` - somewhat like `:difference`, but lower-contrast
+  # * `:clear` where the second object is drawn, the first is removed
+  # * `:source` the second object is drawn as if nothing were below
+  # * `:over` the image shows what you would expect if you held two
+  #    semi-transparent slides on top of each other
+  # * `:in` the first object is removed completely, the second is only
+  #    drawn where the first was
+  # * `:out` the second is drawn only where the first isn't
+  # * `:atop` this leaves the first object mostly intact, but mixes both
+  #    objects in the overlapping area
+  # * `:dest` leaves the first object untouched, the second is discarded
+  #    completely
+  # * `:dest_over` like `:over`, but swaps the arguments
+  # * `:dest_in` like `:in`, but swaps the arguments
+  # * `:dest_out` like `:out`, but swaps the arguments
+  # * `:dest_atop` like `:atop`, but swaps the arguments
+  # * `:xor` something like a difference operator
+  # * `:add` a bit like adding the two images
+  # * `:saturate` a bit like the darker of the two
+  # * `:multiply` at least as dark as the darker of the two inputs
+  # * `:screen` at least as light as the lighter of the inputs
+  # * `:overlay` multiplies or screens colors, depending on the lightness
+  # * `:darken` the darker of each component
+  # * `:lighten` the lighter of each component
+  # * `:colour_dodge` brighten first by a factor second
+  # * `:colour_burn` darken first by a factor of second
+  # * `:hard_light` multiply or screen, depending on lightness
+  # * `:soft_light` darken or lighten, depending on lightness
+  # * `:difference` difference of the two
+  # * `:exclusion` somewhat like `:difference`, but lower-contrast
 
   class BlendMode < Symbol
   end

data/lib/vips/connection.rb

@@ -0,0 +1,46 @@
+# This module provides an interface to the top level bits of libvips
+# via ruby-ffi.
+#
+# Author::    John Cupitt  (mailto:jcupitt@gmail.com)
+# License::   MIT
+
+require "ffi"
+
+module Vips
+  if Vips.at_least_libvips?(8, 9)
+    attach_function :vips_connection_filename, [:pointer], :string
+    attach_function :vips_connection_nick, [:pointer], :string
+  end
+
+  # Abstract base class for connections.
+  class Connection < Vips::Object
+    # The layout of the VipsRegion struct.
+    module ConnectionLayout
+      def self.included(base)
+        base.class_eval do
+          layout :parent, Vips::Object::Struct
+          # rest opaque
+        end
+      end
+    end
+
+    class Struct < Vips::Object::Struct
+      include ConnectionLayout
+    end
+
+    class ManagedStruct < Vips::Object::ManagedStruct
+      include ConnectionLayout
+    end
+
+    # Get any filename associated with a connection, or nil.
+    def filename
+      Vips.vips_connection_filename self
+    end
+
+    # Get a nickname (short description) of a connection that could be shown to
+    # the user.
+    def nick
+      Vips.vips_connection_nick self
+    end
+  end
+end

data/lib/vips/gobject.rb

@@ -4,8 +4,8 @@
 # Author::    John Cupitt  (mailto:jcupitt@gmail.com)
 # License::   MIT
 
-require 'ffi'
-require 'forwardable'
+require "ffi"
+require "forwardable"
 
 module GObject
   # we have a number of things we need to inherit in different ways:
@@ -37,13 +37,15 @@ module GObject
     def_instance_delegators :@struct, :[], :to_ptr
     def_single_delegators :ffi_struct, :ptr
 
+    attr_reader :references
+
     # the layout of the GObject struct
     module GObjectLayout
       def self.included base
         base.class_eval do
           layout :g_type_instance, :pointer,
-                 :ref_count, :uint,
-                 :qdata, :pointer
+            :ref_count, :uint,
+            :qdata, :pointer
         end
       end
     end
@@ -56,7 +58,7 @@ module GObject
         # GLib::logger.debug("GObject::GObject::ManagedStruct.release") {
         #     "unreffing #{ptr}"
         # }
-        ::GObject::g_object_unref ptr
+        ::GObject.g_object_unref ptr
       end
     end
 
@@ -72,7 +74,11 @@ module GObject
     # need the unref
     def initialize ptr
       # GLib::logger.debug("GObject::GObject.initialize") {"ptr = #{ptr}"}
+      @ptr = ptr
       @struct = ffi_managed_struct.new ptr
+
+      # sometimes we need to keep refs across C calls ... hide them here
+      @references = []
     end
 
     # access to the casting struct for this class
@@ -80,9 +86,13 @@ module GObject
       self.class.ffi_struct
     end
 
+    # get the pointer we were built from ... #to_ptr gets the pointer after we
+    # have wrapped it up with an auto unref
+    attr_reader :ptr
+
     class << self
       def ffi_struct
-        self.const_get :Struct
+        const_get :Struct
       end
     end
 
@@ -93,7 +103,7 @@ module GObject
 
     class << self
       def ffi_managed_struct
-        self.const_get :ManagedStruct
+        const_get :ManagedStruct
       end
     end
   end
@@ -101,18 +111,23 @@ module GObject
   class GParamSpec < FFI::Struct
     # the first few public fields
     layout :g_type_instance, :pointer,
-           :name, :string,
-           :flags, :uint,
-           :value_type, :GType,
-           :owner_type, :GType
+      :name, :string,
+      :flags, :uint,
+      :value_type, :GType,
+      :owner_type, :GType
   end
 
   class GParamSpecPtr < FFI::Struct
     layout :value, GParamSpec.ptr
   end
 
-  attach_function :g_param_spec_get_blurb, [GParamSpec.ptr], :string
+  attach_function :g_param_spec_get_blurb, [:pointer], :string
 
   attach_function :g_object_ref, [:pointer], :void
   attach_function :g_object_unref, [:pointer], :void
+
+  # we just use one gcallback type for every signal, hopefully this is OK
+  callback :gcallback, [:pointer], :void
+  attach_function :g_signal_connect_data,
+    [:pointer, :string, :gcallback, :pointer, :pointer, :int], :long
 end