ruby-vips 2.0.14 → 2.0.15

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## Version 2.0.15 (2019-6-12)
+
+* better error messages from `write_to_memory` [linkyndy]
+* fix doc generation typo for array return [jcupitt]
+* update tests for libvips 8.8 [jcupitt]
+
 ## Version 2.0.14 (2018-10-3)
 
 * update links for new home [jcupitt]

data/TODO

@@ -7,10 +7,9 @@
 
 # Common operations
 
-- version bump
+- lint 
 
-	edit lib/vips/version.rb 
-	edit VERSION
+	bundle exec rake rubocop
 
 - reinstall local copy of gem after a change
 
@@ -20,6 +19,11 @@
 
 	bundle exec rake 
 
+- version bump
+
+	edit lib/vips/version.rb 
+	edit VERSION
+
 - regenerate autodocs
 
 	cd lib/vips
@@ -27,6 +31,10 @@
 	require 'vips'; Vips::generate_yard
 	^D
 
+- regenerate .rubocop_todo.yml
+
+	bundle exec rubocop --auto-gen-config
+
 - regenerate docs
 
 	bundle exec rake yard

data/VERSION

@@ -1 +1 @@
-2.0.14
+2.0.15

data/example/daltonize8.rb

@@ -9,18 +9,18 @@
 
 require 'vips'
 
-#Vips.set_debug true
+# Vips.set_debug true
 
 # matrices to convert D65 XYZ to and from bradford cone space
 xyz_to_brad = [
-    [0.8951,  0.2664, -0.1614],
-    [-0.7502,  1.7135,  0.0367],
-    [0.0389, -0.0685,  1.0296]
+  [0.8951, 0.2664, -0.1614],
+  [-0.7502, 1.7135, 0.0367],
+  [0.0389, -0.0685, 1.0296]
 ]
 brad_to_xyz = [
-    [0.987, -0.147, 0.16],
-    [0.432, 0.5184, 0.0493],
-    [-0.0085, 0.04, 0.968]
+  [0.987, -0.147, 0.16],
+  [0.432, 0.5184, 0.0493],
+  [-0.0085, 0.04, 0.968]
 ]
 
 im = Vips::Image.new_from_file ARGV[0]
@@ -47,9 +47,9 @@ brad = xyz.recomb xyz_to_brad
 # we need rows to sum to 1 in Bradford space --- the matrix in the original
 # Python code sums to 1.742
 deut = brad.recomb [
-    [1, 0, 0],
-    [0.7, 0, 0.3],
-    [0, 0, 1]
+  [1, 0, 0],
+  [0.7, 0, 0.3],
+  [0, 0, 1]
 ]
 
 xyz = deut.recomb brad_to_xyz
@@ -61,11 +61,9 @@ rgb = xyz.colourspace :srgb
 err = im - rgb
 
 # add the error back to other channels to make a compensated image
-im = im + err.recomb([
-    [0, 0, 0],
-    [0.7, 1, 0],
-    [0.7, 0, 1]
-])
+im = im + err.recomb([[0, 0, 0],
+                      [0.7, 1, 0],
+                      [0.7, 0, 1]])
 
 # reattach any alpha we saved above
 if alpha

data/example/example1.rb

@@ -5,8 +5,7 @@ require 'vips'
 
 GLib::logger.level = Logger::DEBUG
 
-op = Vips::Operation.new "black"
+Vips::Operation.new "black"
 
-op = nil
 GC.start
 Vips::Operation.print_all

data/example/example4.rb

@@ -6,10 +6,10 @@ require 'vips'
 Vips::leak_set true
 
 # disable the operation cache
-#Vips::cache_set_max 0
+# Vips::cache_set_max 0
 
 # turn on debug logging
-#Vips.set_debug true
+# Vips.set_debug true
 
 ARGV.each do |filename|
   im = Vips::Image.new_from_file filename

data/example/example5.rb

@@ -9,7 +9,7 @@ require 'vips'
 # Vips::cache_set_max 0
 
 # turn on debug logging
-#Vips.set_debug true
+# Vips.set_debug true
 
 if ARGV.length < 2
   raise "usage: #{$PROGRAM_NAME}: input-file output-file"
@@ -22,10 +22,9 @@ im *= [1, 2, 1]
 # we want to be able to specify a scale for the convolution mask, so we have to
 # make it ourselves
 # if you are OK with scale=1, you can just pass the array directly to .conv()
-mask = Vips::Image.new_from_array [
-    [-1, -1, -1],
-    [-1, 16, -1],
-    [-1, -1, -1]], 8
+mask = Vips::Image.new_from_array [[-1, -1, -1],
+                                   [-1, 16, -1],
+                                   [-1, -1, -1]], 8
 im = im.conv mask
 
 im.write_to_file ARGV[1]

data/example/inheritance_with_refcount.rb

@@ -31,11 +31,8 @@ module GLib
   extend FFI::Library
   ffi_lib 'gobject-2.0'
 
-  # nil being the default
-  glib_log_domain = nil
-
-  def self.set_log_domain(domain)
-    glib_log_domain = domain
+  def self.set_log_domain(_domain)
+    # FIXME: this needs hooking up
   end
 
   # we have a set of things we need to inherit in different ways:
@@ -90,7 +87,6 @@ module GLib
         log "GLib::GObject::ManagedStruct.release: unreffing #{ptr}"
         GLib::g_object_unref(ptr) unless ptr.null?
       end
-
     end
 
     # the plain struct ... cast with this
@@ -101,7 +97,6 @@ module GLib
         log "GLib::GObject::Struct.new: #{ptr}"
         super
       end
-
     end
 
     # don't allow ptr == nil, we never want to allocate a GObject struct
@@ -135,12 +130,10 @@ module GLib
         self.const_get(:ManagedStruct)
       end
     end
-
   end
 
   # :gtype will usually be 64-bit, but will be 32-bit on 32-bit Windows
   typedef :ulong, :GType
-
 end
 
 module Vips
@@ -189,7 +182,6 @@ module Vips
   end
 
   class VipsObject < GLib::GObject
-
     # the layout of the VipsObject struct
     module VipsObjectLayout
       def self.included(base)
@@ -216,7 +208,6 @@ module Vips
         log "Vips::VipsObject::Struct.new: #{ptr}"
         super
       end
-
     end
 
     class ManagedStruct < GLib::GObject::ManagedStruct
@@ -226,13 +217,10 @@ module Vips
         log "Vips::VipsObject::ManagedStruct.new: #{ptr}"
         super
       end
-
     end
-
   end
 
   class VipsImage < VipsObject
-
     # the layout of the VipsImage struct
     module VipsImageLayout
       def self.included(base)
@@ -250,7 +238,6 @@ module Vips
         log "Vips::VipsImage::Struct.new: #{ptr}"
         super
       end
-
     end
 
     class ManagedStruct < VipsObject::ManagedStruct
@@ -260,17 +247,14 @@ module Vips
         log "Vips::VipsImage::ManagedStruct.new: #{ptr}"
         super
       end
-
     end
 
     def self.new_partial
       VipsImage.new(Vips::vips_image_new)
     end
-
   end
 
   attach_function :vips_image_new, [], :pointer
-
 end
 
 puts "creating image"
@@ -283,4 +267,3 @@ begin
   puts "x[:parent][:description] = #{x[:parent][:description]}"
   puts ""
 end
-

data/example/thumb.rb

@@ -24,8 +24,6 @@ end
 
 ARGV.each do |filename|
   puts "processing #{filename} ..."
-  thumb = via_memory(filename, 500)
-  # thumb = via_files(filename, 500)
+  _thumb = via_memory(filename, 500)
+  # _thumb = via_files(filename, 500)
 end
-
-

data/example/trim8.rb

@@ -23,16 +23,16 @@ mask = (im.median - background).abs > 10
 # direction
 columns, rows = mask.project
 
-first_column, first_row = columns.profile
+_first_column, first_row = columns.profile
 left = first_row.min
 
-first_column, first_row = columns.fliphor.profile
+_first_column, first_row = columns.fliphor.profile
 right = columns.width - first_row.min
 
-first_column, first_row = rows.profile
+first_column, _first_row = rows.profile
 top = first_column.min
 
-first_column, first_row = rows.flipver.profile
+first_column, _first_row = rows.flipver.profile
 bottom = rows.height - first_column.min
 
 # and now crop the original image

data/lib/vips.rb

@@ -43,7 +43,7 @@ module GLib
   LOG_FLAG_FATAL              = 1 << 1
 
   # GLib log levels
-  LOG_LEVEL_ERROR             = 1 << 2       # always fatal
+  LOG_LEVEL_ERROR             = 1 << 2 # always fatal
   LOG_LEVEL_CRITICAL          = 1 << 3
   LOG_LEVEL_WARNING           = 1 << 4
   LOG_LEVEL_MESSAGE           = 1 << 5
@@ -52,12 +52,12 @@ module GLib
 
   # map glib levels to Logger::Severity
   GLIB_TO_SEVERITY = {
-      LOG_LEVEL_ERROR => Logger::ERROR,
-      LOG_LEVEL_CRITICAL => Logger::FATAL,
-      LOG_LEVEL_WARNING => Logger::WARN,
-      LOG_LEVEL_MESSAGE => Logger::UNKNOWN,
-      LOG_LEVEL_INFO => Logger::INFO,
-      LOG_LEVEL_DEBUG => Logger::DEBUG
+    LOG_LEVEL_ERROR => Logger::ERROR,
+    LOG_LEVEL_CRITICAL => Logger::FATAL,
+    LOG_LEVEL_WARNING => Logger::WARN,
+    LOG_LEVEL_MESSAGE => Logger::UNKNOWN,
+    LOG_LEVEL_INFO => Logger::INFO,
+    LOG_LEVEL_DEBUG => Logger::DEBUG
   }
   GLIB_TO_SEVERITY.default = Logger::UNKNOWN
 
@@ -66,7 +66,7 @@ module GLib
   @glib_log_handler_id = 0
 
   # module-level, so it's not GCd away
-  LOG_HANDLER = Proc.new do |domain, level, message, user_data|
+  LOG_HANDLER = Proc.new do |domain, level, message, _user_data|
     @logger.log(GLIB_TO_SEVERITY[level], message, domain)
   end
 
@@ -111,9 +111,7 @@ module GLib
         GLib::remove_log_handler
       }
     end
-
   end
-
 end
 
 module GObject
@@ -151,7 +149,6 @@ module GObject
   GFLAGS_TYPE = g_type_from_name "GFlags"
   GSTR_TYPE = g_type_from_name "gchararray"
   GOBJECT_TYPE = g_type_from_name "GObject"
-
 end
 
 require 'vips/gobject'
@@ -385,7 +382,7 @@ require 'vips/gvalue'
 #
 # https://developer.gnome.org/glib/stable/glib-Message-Logging.html
 #
-# You can disable wanrings by defining the `VIPS_WARNING` environment variable.
+# You can disable warnings by defining the `VIPS_WARNING` environment variable.
 # You can enable info output by defining `VIPS_INFO`.
 #
 # # Exceptions
@@ -528,7 +525,7 @@ module Vips
   # Turn libvips leak testing on and off. Handy for debugging ruby-vips, not
   # very useful for user code.
   def self.leak_set leak
-    vips_leak_set (leak ? 1 : 0)
+    vips_leak_set((leak ? 1 : 0))
   end
 
   attach_function :vips_cache_set_max, [:int], :void
@@ -614,7 +611,6 @@ module Vips
   # libvips has this arbitrary number as a sanity-check upper bound on image
   # size. It's sometimes useful for know whan calculating image ratios.
   MAX_COORD = 10000000
-
 end
 
 require 'vips/object'
@@ -622,5 +618,3 @@ require 'vips/operation'
 require 'vips/image'
 require 'vips/interpolate'
 require 'vips/version'
-
-

data/lib/vips/align.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # Various types of alignment. See {Image#join}, for example.
   #
   # * `:low` Align on the low coordinate edge

data/lib/vips/angle.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # Various fixed 90 degree rotation angles. See {Image#rot}.
   #
   # * `:d0` no rotate

data/lib/vips/angle45.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # Various fixed 45 degree rotation angles. See {Image#rot45}.
   #
   # * `:d0` no rotate

data/lib/vips/bandformat.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # The format used for each band element. Each corresponds to a native C type
   # for the current machine.
   #
@@ -16,5 +15,4 @@ module Vips
   # * `:dpcomplex` double complex (two double) format
   class BandFormat < Symbol
   end
-
 end

data/lib/vips/blend_mode.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # Blend mode to use when compositing images. See {Image#composite}.
   #
   # `:clear` - where the second object is drawn, the first is removed
@@ -31,4 +30,3 @@ module Vips
   class BlendMode < Symbol
   end
 end
-

data/lib/vips/coding.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # How pixels are coded.
   #
   # Normally, pixels are uncoded and can be manipulated as you would expect.

data/lib/vips/compass_direction.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # A direction on a compass used for placing images. See {Image#gravity}.
   #
   # * `:centre`

data/lib/vips/direction.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # Operations like {Image#flip} need to be told whether to flip
   # left-right or top-bottom.
   #

data/lib/vips/extend.rb

@@ -1,5 +1,4 @@
 module Vips
-
   # When the edges of an image are extended, you can specify
   # how you want the extension done.
   # See {Image#embed}, {Image#conv}, {Image#affine} and

data/lib/vips/gobject.rb

@@ -8,7 +8,6 @@ require 'ffi'
 require 'forwardable'
 
 module GObject
-
   # we have a number of things we need to inherit in different ways:
   #
   # - we want to be able to subclass GObject in Ruby in a simple way
@@ -64,7 +63,6 @@ module GObject
     # the plain struct ... cast with this
     class Struct < FFI::Struct
       include GObjectLayout
-
     end
 
     # don't allow ptr == nil, we never want to allocate a GObject struct
@@ -98,7 +96,6 @@ module GObject
         self.const_get :ManagedStruct
       end
     end
-
   end
 
   class GParamSpec < FFI::Struct
@@ -118,5 +115,4 @@ module GObject
 
   attach_function :g_object_ref, [:pointer], :void
   attach_function :g_object_unref, [:pointer], :void
-
 end