rmagick 3.2.0 → 4.3.0

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '3.2.0'
+  VERSION = '4.3.0'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

data/lib/rmagick_internal.rb

@@ -19,15 +19,39 @@ if RUBY_PLATFORM =~ /mingw/i
 end
 
 require 'English'
+require 'observer'
 require 'RMagick2.so'
-require 'obsolete.rb'
 
 module Magick
   @formats = nil
   @trace_proc = nil
   @exit_block_set_up = nil
+  IMAGEMAGICK_VERSION = Magick::Magick_version.split[1].split('-').first
 
   class << self
+    # Describes the image formats supported by ImageMagick.
+    # If the optional block is present, calls the block once for each image format.
+    # The first argument, +k+, is the format name. The second argument, +v+, is the
+    # properties string described below.
+    #
+    # - +B+ is "*" if the format has native blob support, or " " otherwise.
+    # - +R+ is "r" if ImageMagick can read that format, or "-" otherwise.
+    # - +W+ is "w" if ImageMagick can write that format, or "-" otherwise.
+    # - +A+ is "+" if the format supports multi-image files, or "-" otherwise.
+    #
+    # @overload formats
+    #   @return [Hash] the formats hash
+    #
+    # @overload formats
+    #   @yield [k, v]
+    #   @yieldparam k [String] the format name
+    #   @yieldparam v [String] the properties string
+    #   @return [Magick]
+    #
+    # @example
+    #   p Magick.formats
+    #   => {"3FR"=>" r-+", "3G2"=>" r-+", "3GP"=>" r-+", "A"=>"*rw+",
+    #   ...
     def formats
       @formats ||= init_formats
 
@@ -39,17 +63,37 @@ module Magick
       end
     end
 
-    # remove reference to the proc at exit
+    # If the Magick module attribute +trace_proc+ is set to a Proc object,
+    # RMagick calls the proc whenever an image is created or destroyed.
+    #
+    # You can use this proc to keep track of which images your program has created
+    # and which have been destroyed.
+    #
+    # @param p [Proc] The proc object.
+    #   The following value will be passed into the proc object.
+    #   - +which+ - A symbol that indicates which operation the proc is being called for.
+    #     If the proc is called for an image creation, the value is +:c+.
+    #     If called for an image destruction, the value is +:d+.
+    #   - +description+ - A string describing the image. This is the same string that
+    #     would be returned by calling the image's inspect method.
+    #   - +id+ - A unique identifier for the image. This identifier is not the same as the object's +object_id+.
+    #   - +method+ - The name of the method responsible for creating or destroying the image.
+    #
+    # @example
+    #   Magick.trace_proc = proc do |which, description, id, method|
+    #     ...
+    #   end
+    #
+    # @deprecated Magick.trace_proc= is deprecated. This method will be removed in RMagick 5.0.
     def trace_proc=(p)
-      m = Mutex.new
-      m.synchronize do
-        if @trace_proc.nil? && !p.nil? && !@exit_block_set_up
-          at_exit { @trace_proc = nil }
-          @exit_block_set_up = true
-        end
+      warn 'Magick.trace_proc= is deprecated. This method will be removed in RMagick 5.0.'
 
-        @trace_proc = p
+      if @trace_proc.nil? && !p.nil? && !@exit_block_set_up
+        at_exit { @trace_proc = nil }
+        @exit_block_set_up = true
       end
+
+      @trace_proc = p
     end
   end
 
@@ -67,12 +111,14 @@ module Magick
 
   class Geometry
     FLAGS = ['', '%', '!', '<', '>', '@', '^']
-    RFLAGS = { '%' => PercentGeometry,
-               '!' => AspectGeometry,
-               '<' => LessGeometry,
-               '>' => GreaterGeometry,
-               '@' => AreaGeometry,
-               '^' => MinimumGeometry }
+    RFLAGS = {
+      '%' => PercentGeometry,
+      '!' => AspectGeometry,
+      '<' => LessGeometry,
+      '>' => GreaterGeometry,
+      '@' => AreaGeometry,
+      '^' => MinimumGeometry
+    }
 
     attr_accessor :width, :height, :x, :y, :flag
 
@@ -131,7 +177,7 @@ module Magick
       str = ''
       if @width > 0
         fmt = @width.truncate == @width ? '%d' : '%.2f'
-        str << format(fmt, @width)
+        str << sprintf(fmt, @width)
         str << '%' if @flag == PercentGeometry
       end
 
@@ -139,10 +185,10 @@ module Magick
 
       if @height > 0
         fmt = @height.truncate == @height ? '%d' : '%.2f'
-        str << format(fmt, @height)
+        str << sprintf(fmt, @height)
         str << '%' if @flag == PercentGeometry
       end
-      str << format('%+d%+d', @x, @y) if @x != 0 || @y != 0
+      str << sprintf('%+d%+d', @x, @y) if @x != 0 || @y != 0
       str << FLAGS[@flag.to_i] if @flag != PercentGeometry
       str
     end
@@ -233,20 +279,23 @@ module Magick
     # Apply coordinate transformations to support scaling (s), rotation (r),
     # and translation (t). Angles are specified in radians.
     def affine(sx, rx, ry, sy, tx, ty)
-      primitive 'affine ' + format('%g,%g,%g,%g,%g,%g', sx, rx, ry, sy, tx, ty)
+      primitive 'affine ' + sprintf('%g,%g,%g,%g,%g,%g', sx, rx, ry, sy, tx, ty)
     end
 
     # Set alpha (make transparent) in image according to the specified
     # colorization rule
     def alpha(x, y, method)
       Kernel.raise ArgumentError, 'Unknown paint method' unless PAINT_METHOD_NAMES.key?(method.to_i)
-      primitive 'matte ' + format('%g,%g, %s', x, y, PAINT_METHOD_NAMES[method.to_i])
+      name = Gem::Version.new(Magick::IMAGEMAGICK_VERSION) > Gem::Version.new('7.0.0') ? 'alpha ' : 'matte '
+      primitive name + sprintf('%g,%g, %s', x, y, PAINT_METHOD_NAMES[method.to_i])
     end
 
     # Draw an arc.
     def arc(start_x, start_y, end_x, end_y, start_degrees, end_degrees)
-      primitive 'arc ' + format('%g,%g %g,%g %g,%g',
-                                start_x, start_y, end_x, end_y, start_degrees, end_degrees)
+      primitive 'arc ' + sprintf(
+        '%g,%g %g,%g %g,%g',
+        start_x, start_y, end_x, end_y, start_degrees, end_degrees
+      )
     end
 
     # Draw a bezier curve.
@@ -256,12 +305,12 @@ module Magick
       elsif points.length.odd?
         Kernel.raise ArgumentError, 'odd number of arguments specified'
       end
-      primitive 'bezier ' + points.map! { |x| format('%g', x) }.join(',')
+      primitive 'bezier ' + points.map! { |x| sprintf('%g', x) }.join(',')
     end
 
     # Draw a circle
     def circle(origin_x, origin_y, perim_x, perim_y)
-      primitive 'circle ' + format('%g,%g %g,%g', origin_x, origin_y, perim_x, perim_y)
+      primitive 'circle ' + sprintf('%g,%g %g,%g', origin_x, origin_y, perim_x, perim_y)
     end
 
     # Invoke a clip-path defined by def_clip_path.
@@ -285,7 +334,7 @@ module Magick
     # point, replace, floodfill, filltoborder,reset
     def color(x, y, method)
       Kernel.raise ArgumentError, "Unknown PaintMethod: #{method}" unless PAINT_METHOD_NAMES.key?(method.to_i)
-      primitive 'color ' + format('%g,%g,%s', x, y, PAINT_METHOD_NAMES[method.to_i])
+      primitive 'color ' + sprintf('%g,%g,%s', x, y, PAINT_METHOD_NAMES[method.to_i])
     end
 
     # Specify EITHER the text decoration (none, underline, overline,
@@ -316,8 +365,10 @@ module Magick
 
     # Draw an ellipse
     def ellipse(origin_x, origin_y, width, height, arc_start, arc_end)
-      primitive 'ellipse ' + format('%g,%g %g,%g %g,%g',
-                                    origin_x, origin_y, width, height, arc_start, arc_end)
+      primitive 'ellipse ' + sprintf(
+        '%g,%g %g,%g %g,%g',
+        origin_x, origin_y, width, height, arc_start, arc_end
+      )
     end
 
     # Let anything through, but the only defined argument
@@ -383,7 +434,7 @@ module Magick
     def image(composite, x, y, width, height, image_file_path)
       Kernel.raise ArgumentError, 'Unknown composite' unless composite.is_a?(CompositeOperator)
       composite_name = composite.to_s.sub!('CompositeOp', '')
-      primitive 'image ' + format('%s %g,%g %g,%g %s', composite_name, x, y, width, height, enquote(image_file_path))
+      primitive 'image ' + sprintf('%s %g,%g %g,%g %s', composite_name, x, y, width, height, enquote(image_file_path))
     end
 
     # IM 6.5.5-8 and later
@@ -424,15 +475,7 @@ module Magick
 
     # Draw a line
     def line(start_x, start_y, end_x, end_y)
-      primitive 'line ' + format('%g,%g %g,%g', start_x, start_y, end_x, end_y)
-    end
-
-    # Set matte (make transparent) in image according to the specified
-    # colorization rule
-    def matte(x, y, method)
-      Kernel.warn 'Draw#matte is deprecated. Use Draw#alpha instead.'
-      Kernel.raise ArgumentError, 'Unknown paint method' unless PAINT_METHOD_NAMES.key?(method.to_i)
-      primitive 'matte ' + format('%g,%g, %s', x, y, PAINT_METHOD_NAMES[method.to_i])
+      primitive 'line ' + sprintf('%g,%g %g,%g', start_x, start_y, end_x, end_y)
     end
 
     # Specify drawing fill and stroke opacities. If the value is a string
@@ -454,7 +497,7 @@ module Magick
     # as the argument to the 'fill' or 'stroke' methods
     def pattern(name, x, y, width, height)
       push('defs')
-      push("pattern #{name} " + format('%g %g %g %g', x, y, width, height))
+      push("pattern #{name} " + sprintf('%g %g %g %g', x, y, width, height))
       push('graphic-context')
       yield
     ensure
@@ -465,13 +508,13 @@ module Magick
 
     # Set point to fill color.
     def point(x, y)
-      primitive 'point ' + format('%g,%g', x, y)
+      primitive 'point ' + sprintf('%g,%g', x, y)
     end
 
     # Specify the font size in points. Yes, the primitive is "font-size" but
     # in other places this value is called the "pointsize". Give it both names.
     def pointsize(points)
-      primitive 'font-size ' + format('%g', points)
+      primitive 'font-size ' + sprintf('%g', points)
     end
     alias font_size pointsize
 
@@ -482,7 +525,7 @@ module Magick
       elsif points.length.odd?
         Kernel.raise ArgumentError, 'odd number of points specified'
       end
-      primitive 'polygon ' + points.map! { |x| format('%g', x) }.join(',')
+      primitive 'polygon ' + points.map! { |x| sprintf('%g', x) }.join(',')
     end
 
     # Draw a polyline
@@ -492,7 +535,7 @@ module Magick
       elsif points.length.odd?
         Kernel.raise ArgumentError, 'odd number of points specified'
       end
-      primitive 'polyline ' + points.map! { |x| format('%g', x) }.join(',')
+      primitive 'polyline ' + points.map! { |x| sprintf('%g', x) }.join(',')
     end
 
     # Return to the previously-saved set of whatever
@@ -526,32 +569,36 @@ module Magick
 
     # Draw a rectangle
     def rectangle(upper_left_x, upper_left_y, lower_right_x, lower_right_y)
-      primitive 'rectangle ' + format('%g,%g %g,%g',
-                                      upper_left_x, upper_left_y, lower_right_x, lower_right_y)
+      primitive 'rectangle ' + sprintf(
+        '%g,%g %g,%g',
+        upper_left_x, upper_left_y, lower_right_x, lower_right_y
+      )
     end
 
     # Specify coordinate space rotation. "angle" is measured in degrees
     def rotate(angle)
-      primitive 'rotate ' + format('%g', angle)
+      primitive 'rotate ' + sprintf('%g', angle)
     end
 
     # Draw a rectangle with rounded corners
     def roundrectangle(center_x, center_y, width, height, corner_width, corner_height)
-      primitive 'roundrectangle ' + format('%g,%g,%g,%g,%g,%g',
-                                           center_x, center_y, width, height, corner_width, corner_height)
+      primitive 'roundrectangle ' + sprintf(
+        '%g,%g,%g,%g,%g,%g',
+        center_x, center_y, width, height, corner_width, corner_height
+      )
     end
 
     # Specify scaling to be applied to coordinate space on subsequent drawing commands.
     def scale(x, y)
-      primitive 'scale ' + format('%g,%g', x, y)
+      primitive 'scale ' + sprintf('%g,%g', x, y)
     end
 
     def skewx(angle)
-      primitive 'skewX ' + format('%g', angle)
+      primitive 'skewX ' + sprintf('%g', angle)
     end
 
     def skewy(angle)
-      primitive 'skewY ' + format('%g', angle)
+      primitive 'skewY ' + sprintf('%g', angle)
     end
 
     # Specify the object stroke, a color name or pattern name.
@@ -581,7 +628,7 @@ module Magick
 
     # Specify the initial offset in the dash pattern
     def stroke_dashoffset(value = 0)
-      primitive 'stroke-dashoffset ' + format('%g', value)
+      primitive 'stroke-dashoffset ' + sprintf('%g', value)
     end
 
     def stroke_linecap(value)
@@ -608,7 +655,7 @@ module Magick
 
     # Specify stroke (outline) width in pixels.
     def stroke_width(pixels)
-      primitive 'stroke-width ' + format('%g', pixels)
+      primitive 'stroke-width ' + sprintf('%g', pixels)
     end
 
     # Draw text at position x,y. Add quotes to text that is not already quoted.
@@ -626,7 +673,7 @@ module Magick
         # escape existing braces, surround with braces
         text = '{' + text.gsub(/[}]/) { |b| '\\' + b } + '}'
       end
-      primitive 'text ' + format('%g,%g %s', x, y, text)
+      primitive 'text ' + sprintf('%g,%g %s', x, y, text)
     end
 
     # Specify text alignment relative to a given point
@@ -655,7 +702,7 @@ module Magick
     # Specify center of coordinate space to use for subsequent drawing
     # commands.
     def translate(x, y)
-      primitive 'translate ' + format('%g,%g', x, y)
+      primitive 'translate ' + sprintf('%g,%g', x, y)
     end
   end # class Magick::Draw
 
@@ -863,7 +910,7 @@ module Magick
       else
         get_exif_by_number # ensure properties is populated with exif data
         tag.each do |num|
-          rval = self[format('#%04X', num.to_i)]
+          rval = self[sprintf('#%04X', num.to_i)]
           hash[num] = rval == 'unknown' ? nil : rval
         end
       end
@@ -1071,7 +1118,7 @@ module Magick
 
         # Define a getter and a setter for each channel.
         %i[red green blue opacity].each do |c|
-          module_eval <<-END_EVAL
+          module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
             def #{c}
                 return collect { |p| p.#{c} }
             end
@@ -1127,7 +1174,6 @@ module Magick
           each { |x| @view[x] = rv.dup }
           changed
           notify_observers(self)
-          nil
         end
 
         # A pixel has been modified. Tell the view.
@@ -1250,16 +1296,14 @@ module Magick
 
     protected
 
-    def is_an_image(obj)
+    def assert_image(obj)
       Kernel.raise ArgumentError, "Magick::Image required (#{obj.class} given)" unless obj.is_a? Magick::Image
-      true
     end
 
     # Ensure array is always an array of Magick::Image objects
-    def is_an_image_array(ary)
+    def assert_image_array(ary)
       Kernel.raise ArgumentError, "Magick::ImageList or array of Magick::Images required (#{ary.class} given)" unless ary.respond_to? :each
-      ary.each { |obj| is_an_image obj }
-      true
+      ary.each { |obj| assert_image obj }
     end
 
     # Find old current image, update scene number
@@ -1291,7 +1335,7 @@ module Magick
       if n.nil?
         Kernel.raise IndexError, 'scene number out of bounds' unless @images.length.zero?
         @scene = nil
-        return @scene
+        return
       elsif @images.length.zero?
         Kernel.raise IndexError, 'scene number out of bounds'
       end
@@ -1299,13 +1343,12 @@ module Magick
       n = Integer(n)
       Kernel.raise IndexError, 'scene number out of bounds' if n < 0 || n > length - 1
       @scene = n
-      @scene
     end
 
     # All the binary operators work the same way.
     # 'other' should be either an ImageList or an Array
     %w[& + - |].each do |op|
-      module_eval <<-END_BINOPS
+      module_eval <<-END_BINOPS, __FILE__, __LINE__ + 1
         def #{op}(other)
           ilist = self.class.new
           begin
@@ -1315,7 +1358,7 @@ module Magick
           end
           current = get_current()
           a.each do |image|
-            is_an_image image
+            assert_image image
             ilist << image
           end
           ilist.set_current current
@@ -1334,7 +1377,7 @@ module Magick
     end
 
     def <<(obj)
-      is_an_image obj
+      assert_image obj
       @images << obj
       @scene = @images.length - 1
       self
@@ -1375,20 +1418,21 @@ module Magick
     def []=(*args)
       obj = @images.[]=(*args)
       if obj && obj.respond_to?(:each)
-        is_an_image_array(obj)
+        assert_image_array(obj)
         set_current obj.last.__id__
       elsif obj
-        is_an_image(obj)
+        assert_image(obj)
         set_current obj.__id__
       else
         set_current nil
       end
-      obj
     end
 
-    %i[at each each_index empty? fetch
-       first hash include? index length rindex sort!].each do |mth|
-      module_eval <<-END_SIMPLE_DELEGATES
+    %i[
+      at each each_index empty? fetch
+      first hash include? index length rindex sort!
+    ].each do |mth|
+      module_eval <<-END_SIMPLE_DELEGATES, __FILE__, __LINE__ + 1
         def #{mth}(*args, &block)
           @images.#{mth}(*args, &block)
         end
@@ -1410,7 +1454,7 @@ module Magick
     # override Enumerable#collect
     def collect(&block)
       current = get_current
-      a = @images.collect(&block)
+      a = @images.map(&block)
       ilist = self.class.new
       a.each { |image| ilist << image }
       ilist.set_current current
@@ -1418,8 +1462,8 @@ module Magick
     end
 
     def collect!(&block)
-      @images.collect!(&block)
-      is_an_image_array @images
+      @images.map!(&block)
+      assert_image_array @images
       self
     end
 
@@ -1428,7 +1472,6 @@ module Magick
       ditto = self.class.new
       @images.each { |f| ditto << f.copy }
       ditto.scene = @scene
-      ditto.taint if tainted?
       ditto
     end
 
@@ -1439,6 +1482,7 @@ module Magick
     end
 
     # ImageList#map took over the "map" name. Use alternatives.
+    alias map collect
     alias __map__ collect
     alias map! collect!
     alias __map__! collect!
@@ -1463,7 +1507,7 @@ module Magick
     end
 
     def concat(other)
-      is_an_image_array other
+      assert_image_array other
       other.each { |image| @images << image }
       @scene = length - 1
       self
@@ -1477,7 +1521,7 @@ module Magick
     end
 
     def delete(obj, &block)
-      is_an_image obj
+      assert_image obj
       current = get_current
       a = @images.delete(obj, &block)
       set_current current
@@ -1502,12 +1546,11 @@ module Magick
       ditto = self.class.new
       @images.each { |img| ditto << img }
       ditto.scene = @scene
-      ditto.taint if tainted?
       ditto
     end
 
     def eql?(other)
-      is_an_image_array other
+      assert_image_array other
       eql = other.eql?(@images)
       begin # "other" is another ImageList
         eql &&= @scene == other.scene
@@ -1518,10 +1561,10 @@ module Magick
     end
 
     def fill(*args, &block)
-      is_an_image args[0] unless block_given?
+      assert_image args[0] unless block_given?
       current = get_current
       @images.fill(*args, &block)
-      is_an_image_array self
+      assert_image_array self
       set_current current
       self
     end
@@ -1529,7 +1572,7 @@ module Magick
     # Override Enumerable's find_all
     def find_all(&block)
       current = get_current
-      a = @images.find_all(&block)
+      a = @images.select(&block)
       ilist = self.class.new
       a.each { |image| ilist << image }
       ilist.set_current current
@@ -1553,14 +1596,12 @@ module Magick
       filenames.each do |f|
         Magick::Image.read(f, &block).each { |n| @images << n }
       end
-      if length > 0
-        @scene = length - 1 # last image in array
-      end
-      self
+
+      @scene = length - 1 if length > 0 # last image in array
     end
 
     def insert(index, *args)
-      args.each { |image| is_an_image image }
+      args.each { |image| assert_image image }
       current = get_current
       @images.insert(index, *args)
       set_current current
@@ -1579,7 +1620,6 @@ module Magick
       n = Integer(n)
       Kernel.raise ArgumentError, 'iterations must be between 0 and 65535' if n < 0 || n > 65_535
       @images.each { |f| f.iterations = n }
-      self
     end
 
     def last(*args)
@@ -1660,7 +1700,7 @@ module Magick
 
     def push(*objs)
       objs.each do |image|
-        is_an_image image
+        assert_image image
         @images << image
       end
       @scene = length - 1
@@ -1696,7 +1736,7 @@ module Magick
     end
 
     def replace(other)
-      is_an_image_array other
+      assert_image_array other
       current = get_current
       @images.clear
       other.each { |image| @images << image }
@@ -1794,7 +1834,7 @@ module Magick
 
     # @scene -> new object
     def unshift(obj)
-      is_an_image obj
+      assert_image obj
       @images.unshift(obj)
       @scene = 0
       self
@@ -1811,6 +1851,11 @@ module Magick
     alias indices values_at
   end # Magick::ImageList
 
+  class Pixel
+    # include Observable for Image::View class
+    include Observable
+  end
+
   #  Collects non-specific optional method arguments
   class OptionalMethodArguments
     def initialize(img)

data/lib/rvg/clippath.rb

@@ -30,7 +30,8 @@ module Magick
         yield(self) if block_given?
       end
 
-      def add_primitives(gc, _style) #:nodoc:
+      # @private
+      def add_primitives(gc, _style)
         name = __id__.to_s
         gc.define_clip_path(name) do
           gc.clip_units(@clip_path_units)

data/lib/rvg/container.rb

@@ -6,7 +6,8 @@ module Magick
   class RVG
     # Content is simply an Array with a deep_copy method.
     # When unit-testing, it also has a deep_equal method.
-    class Content < Array #:nodoc:
+    # @private
+    class Content < Array
       def deep_copy(h = {})
         me = __id__
         copy = h[me]
@@ -64,7 +65,8 @@ module Magick
         yield(self) if block_given?
       end
 
-      def add_primitives(gc) #:nodoc:
+      # @private
+      def add_primitives(gc)
         gc.push
         add_transform_primitives(gc)
         add_style_primitives(gc)
@@ -73,13 +75,15 @@ module Magick
       end
 
       # Translate container according to #use arguments
-      def ref(x, y, _width, _height) #:nodoc:
+      # @private
+      def ref(x, y, _width, _height)
         translate(x, y) if x != 0 || y != 0
       end
 
       # Append an arbitrary object to the group's content. Called
       # by #use to insert a non-container object into a group.
-      def <<(obj) #:nodoc:
+      # @private
+      def <<(obj)
         @content << obj
       end
     end # class Group
@@ -113,7 +117,8 @@ module Magick
         @element.ref(x, y, width, height)
       end
 
-      def add_primitives(gc) #:nodoc:
+      # @private
+      def add_primitives(gc)
         gc.push
         add_transform_primitives(gc)
         add_style_primitives(gc)

data/lib/rvg/describable.rb

@@ -11,7 +11,7 @@ module Magick
     module Describable
       private
 
-      def initialize(*args, &block) #:nodoc:
+      def initialize(*args, &block)
         super
         @title, @desc, @metadata = nil
       end