rmagick 6.0.1 → 6.1.0

data/ext/RMagick/extconf.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 lib_dir = File.expand_path('../../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
-require 'rubygems'
 require 'mkmf'
 require 'pkg-config'
 
@@ -108,9 +109,6 @@ module RMagick
 
       else
 
-        check_multiple_imagemagick_versions
-        check_partial_imagemagick_versions
-
         original_ldflags = $LDFLAGS.dup
 
         libdir  = PKGConfig.libs_only_L($magick_package).chomp.sub('-L', '')
@@ -127,10 +125,8 @@ module RMagick
           # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
           $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
-
-        configure_archflags_for_osx($magick_package) if RUBY_PLATFORM.include?('darwin') # osx
-
       end
+
       $CPPFLAGS += ' $(optflags) $(debugflags) -fomit-frame-pointer'
     end
 
@@ -167,10 +163,14 @@ module RMagick
 
     def determine_imagemagick_package
       packages = [installed_im7_packages, installed_im6_packages].flatten
+      return if packages.empty?
 
-      if packages.empty?
-        exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find ImageMagick with pkg-config\n"
-      end
+      msg = "\nDetected ImageMagick packages:\n"
+      Logging.message msg
+      message msg
+      package_paths = packages.map { |package| "- #{PKGConfig.package_config(package).pc_path}" }.join("\n")
+      Logging.message package_paths + "\n\n"
+      message package_paths + "\n\n"
 
       if installed_im6_packages.any? && installed_im7_packages.any?
         checking_for('forced use of ImageMagick 6') do
@@ -185,8 +185,7 @@ module RMagick
       end
 
       if packages.length > 1
-        package_lines = packages.map { |package| " - #{package}" }.join("\n")
-        msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n#{package_lines}\n\n"
+        msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n\n"
         Logging.message msg
         message msg
       end
@@ -194,80 +193,6 @@ module RMagick
       packages.first
     end
 
-    # Seems like lots of people have multiple versions of ImageMagick installed.
-    def check_multiple_imagemagick_versions
-      versions = []
-      path = ENV['PATH'].split(File::PATH_SEPARATOR)
-      path.each do |dir|
-        file = File.join(dir, 'Magick-config')
-        next unless File.executable? file
-
-        vers = `#{file} --version`.chomp.strip
-        prefix = `#{file} --prefix`.chomp.strip
-        versions << [vers, prefix, dir]
-      end
-      versions.uniq!
-      return unless versions.size > 1
-
-      msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n"
-      versions.each do |vers, prefix, dir|
-        msg << "         #{dir}/Magick-config reports version #{vers} is installed in #{prefix}\n"
-      end
-      msg << "Using #{versions[0][0]} from #{versions[0][1]}.\n\n"
-      Logging.message msg
-      message msg
-    end
-
-    # Ubuntu (maybe other systems) comes with a partial installation of
-    # ImageMagick in the prefix /usr (some libraries, no includes, and no
-    # binaries). This causes problems when /usr/lib is in the path (e.g., using
-    # the default Ruby installation).
-    def check_partial_imagemagick_versions
-      prefix = config_string('prefix') || ''
-      matches = [
-        prefix + '/lib/lib?agick*',
-        prefix + '/include/ImageMagick',
-        prefix + '/bin/Magick-config'
-      ].map do |file_glob|
-        Dir.glob(file_glob)
-      end
-      matches.delete_if(&:empty?)
-      return unless !matches.empty? && matches.length < 3
-
-      msg = <<~MESSAGE
-
-        Warning: Found a partial ImageMagick installation. Your operating
-        system likely has some built-in ImageMagick libraries but not all of
-        ImageMagick. This will most likely cause problems at both compile and
-        runtime.
-        Found partial installation at: #{prefix}
-
-      MESSAGE
-
-      Logging.message msg
-      message msg
-    end
-
-    # issue #169
-    # set ARCHFLAGS appropriately for OSX
-    def configure_archflags_for_osx(magick_package)
-      return unless PKGConfig.libs_only_L(magick_package) =~ %r{-L(.+)/lib}
-
-      imagemagick_dir = Regexp.last_match(1)
-      command = Dir.glob(File.join(imagemagick_dir, "bin/*")).find { |file| File.executable? file }
-      fileinfo = `file #{command}`
-
-      # default ARCHFLAGS
-      archs = $ARCH_FLAG.scan(/-arch\s+(\S+)/).flatten
-
-      archflags = []
-      archs.each do |arch|
-        archflags << "-arch #{arch}" if fileinfo.include?(arch)
-      end
-
-      $ARCH_FLAG = archflags.join(' ') unless archflags.empty?
-    end
-
     def search_paths_for_windows
       msg = 'searching PATH for the ImageMagick library...'
       Logging.message msg
@@ -299,7 +224,6 @@ module RMagick
     end
 
     def assert_can_compile!
-      assert_minimum_ruby_version!
       assert_has_dev_libs!
 
       # Check for compiler. Extract first word so ENV['CXX'] can be a program name with arguments.
@@ -307,14 +231,6 @@ module RMagick
       exit_failure "No C++ compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cxx)
     end
 
-    def assert_minimum_ruby_version!
-      supported = checking_for("Ruby version >= #{MIN_RUBY_VERS}") do
-        Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(MIN_RUBY_VERS)
-      end
-
-      exit_failure "Can't install RMagick #{RMAGICK_VERS}. Ruby #{MIN_RUBY_VERS} or later required.\n" unless supported
-    end
-
     def assert_has_dev_libs!
       failure_message = <<~END_FAILURE
         Can't install RMagick #{RMAGICK_VERS}.
@@ -327,11 +243,10 @@ module RMagick
         $magick_version = Regexp.last_match(1)
         exit_failure failure_message unless $magick_version
       else
-        unless PKGConfig.libs('MagickCore')[/\bl\s*(MagickCore|Magick)6?\b/]
+        unless ($magick_package = determine_imagemagick_package)
           exit_failure failure_message
         end
 
-        $magick_package = determine_imagemagick_package
         $magick_version = PKGConfig.modversion($magick_package)[/^(\d+\.\d+\.\d+)/]
       end
 

data/ext/RMagick/rmagick.h

@@ -349,7 +349,7 @@ EXTERN VALUE Class_Chromaticity;
 EXTERN VALUE Class_Color;
 EXTERN VALUE Class_Font;
 EXTERN VALUE Class_Geometry;
-EXTERN VALUE Class_GeometryValue;   // Defined in RMagick.rb
+EXTERN VALUE Class_GeometryValue;   // Defined in rmagick_internal.rb
 EXTERN VALUE Class_Pixel;
 EXTERN VALUE Class_Point;
 EXTERN VALUE Class_PolaroidOptions;

data/ext/RMagick/rmilist.cpp

@@ -744,7 +744,7 @@ ImageList_optimize_layers(VALUE self, VALUE method)
  * No Ruby usage (internal function)
  *
  * Notes:
- *   - this simply calls ImageList.new() in RMagick.rb
+ *   - this simply calls ImageList.new() in rmagick_internal.rb
  *
  * @return a new imagelist
  */

data/ext/RMagick/rmimage.cpp

@@ -11600,6 +11600,8 @@ rd_image(VALUE klass ATTRIBUTE_UNUSED, VALUE file, gvl_function_t fp)
     rm_check_exception(exception, images, DestroyOnError);
     DestroyExceptionInfo(exception);
 
+    rm_ensure_result(images);
+
     rm_set_user_artifact(images, info);
     rm_sync_image_options(images, info);
 

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '6.0.1'
+  VERSION = '6.1.0'
   MIN_RUBY_VERSION = '3.0.0'
   MIN_IM_VERSION = '6.8.9'
 end

data/lib/rmagick_internal.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# $Id: RMagick.rb,v 1.84 2009/09/15 22:08:41 rmagick Exp $
+# $Id: rmagick_internal.rb,v 1.84 2009/09/15 22:08:41 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2009 by Timothy P. Hunter
-#   Name:       RMagick.rb
+#   Name:       rmagick_internal.rb
 #   Author:     Tim Hunter
 #   Purpose:    Extend Ruby to interface with ImageMagick.
 #   Notes:      RMagick2.so defines the classes. The code below adds methods

data/lib/rvg/clippath.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: clippath.rb,v 1.5 2009/02/28 23:52:13 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: container.rb,v 1.5 2009/02/28 23:52:13 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/deep_equal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class RVG
     [PathData, Styles, Transforms].each do |c|

data/lib/rvg/describable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: describable.rb,v 1.5 2009/02/28 23:52:13 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/embellishable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: embellishable.rb,v 1.9 2009/02/28 23:52:13 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/misc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # $Id: misc.rb,v 1.17 2010/03/21 01:43:01 baror Exp $
 # Copyright (C) 2009 Timothy P. Hunter
 module Magick

data/lib/rvg/paint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: paint.rb,v 1.6 2009/02/28 23:52:28 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/pathdata.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: pathdata.rb,v 1.5 2009/02/28 23:52:28 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/rvg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--############################################################################
 # $Id: rvg.rb,v 1.10 2009/02/28 23:52:28 rmagick Exp $
 #

data/lib/rvg/stretchable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: stretchable.rb,v 1.7 2009/02/28 23:52:28 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/stylable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: stylable.rb,v 1.7 2009/02/28 23:52:28 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: text.rb,v 1.7 2009/02/28 23:52:28 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/transformable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # $Id: transformable.rb,v 1.5 2009/02/28 23:52:28 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter

data/lib/rvg/units.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # $Id: units.rb,v 1.5 2009/02/28 23:52:28 rmagick Exp $
 # Copyright (C) 2009 Timothy P. Hunter
 module Magick

data/rmagick.gemspec

@@ -1,4 +1,5 @@
-require 'date'
+# frozen_string_literal: true
+
 require 'English'
 require './lib/rmagick/version'
 
@@ -15,6 +16,7 @@ Gem::Specification.new do |s|
   s.metadata['bug_tracker_uri'] = 'https://github.com/rmagick/rmagick/issues'
   s.metadata['documentation_uri'] = 'https://rmagick.github.io/'
   s.metadata['changelog_uri'] = 'https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md'
+  s.metadata['rubygems_mfa_required'] = 'true'
 
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   file_exclusion_regex = /\A(doc|benchmarks|examples|spec|Steepfile)/
@@ -27,6 +29,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
 
-  s.add_runtime_dependency 'observer', '~> 0.1'
-  s.add_runtime_dependency 'pkg-config', '~> 1.4'
+  s.add_dependency 'observer', '~> 0.1'
+  s.add_dependency 'pkg-config', '~> 1.4'
 end

data/sig/rmagick/_draw_common_methods.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   interface _DrawCommonMethods
     def affine: (magick_real sx, magick_real rx, magick_real ry, magick_real sy, magick_real tx, magick_real ty) -> self

data/sig/rmagick/_image_common_methods.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   interface _ImageCommonMethods
     # Magick::Image / Magick::ImageList common methods
@@ -20,7 +22,7 @@ module Magick
     def matte_replace: (int x, int y) -> Image
     def matte_floodfill: (int x, int y) -> Image
     def matte_fill_to_border: (int x, int y) -> Image
-    def matte_reset!: -> Image
+    def matte_reset!: () -> Image
     def resize_to_fill: (real ncols, ?real nrows, ?GravityType gravity) -> Image
     def resize_to_fill!: (real ncols, ?real nrows, ?GravityType gravity) -> Image
     alias crop_resized resize_to_fill
@@ -304,7 +306,7 @@ module Magick
     def raise: (?int width, ?int height, ?bool raised) -> Image
     def random_threshold_channel: (Geometry | string geometry, *ChannelType channel) -> Image
     def recolor: (Array[magick_real] color_matrix) -> Image
-    def reduce_noise: (int radius)  -> Image
+    def reduce_noise: (int radius) -> Image
     def resample: (?magick_real x_resolution, ?magick_real y_resolution, ?FilterType filter, ?magick_real blur) -> Image
     def resample!: (?magick_real x_resolution, ?magick_real y_resolution, ?FilterType filter, ?magick_real blur) -> self
     def resize: (magick_real scale) -> Image

data/sig/rmagick/draw.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class Draw
     include DrawAttribute

data/sig/rmagick/draw_attribute.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   module DrawAttribute
     attr_writer affine: AffineMatrix

data/sig/rmagick/enum.rbs

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Magick
   class Enum
     def initialize: (interned sym, int val) -> void
-    def to_s: -> String
-    def to_i: -> Integer
+    def to_s: () -> String
+    def to_i: () -> Integer
     def <=>: (Enum other) -> (-1 | 0 | 1 | nil)
     def ===: (Enum other) -> bool
     def |: (Enum other) -> Enum
@@ -10,11 +12,11 @@ module Magick
 
   interface _EnumInstanceMethod
     def initialize: (interned sym, int val) -> void
-    def inspect: -> String
+    def inspect: () -> String
   end
 
   interface _EnumClassMethod[T]
-    def values: -> Array[T]
+    def values: () -> Array[T]
   end
 
   class GeometryValue < Enum

data/sig/rmagick/error.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class ImageMagickError < StandardError
     attr_reader magick_location: String

data/sig/rmagick/fill.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class GradientFill
     include _Fill

data/sig/rmagick/geometry.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class Geometry
     attr_accessor width: Integer | Float
@@ -8,7 +10,7 @@ module Magick
 
     def initialize: (?magick_real? width, ?magick_real? height, ?real? x, ?real? y, ?GeometryValue? flag) -> void
     def self.from_s: (String str) -> Geometry
-    def to_s: -> String
+    def to_s: () -> String
   end
 end
 

data/sig/rmagick/image.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class Image
     include Comparable
@@ -29,7 +31,7 @@ module Magick
     def []=: (interned key_arg, String attr_arg) -> self
     def delay=: (int val) -> int
     def display: () -> self
-               | () { (Image::Info) -> void} -> self
+               | () { (Image::Info) -> void } -> self
     def marshal_dump: () -> [String, String]
     def marshal_load: ([string, string] ary) -> self
     def montage: () -> String?
@@ -37,9 +39,9 @@ module Magick
     def scene: () -> Integer
     def ticks_per_second=: (int tps) -> int
     def to_blob: () -> String?
-               | () { (Image::Info) -> void} -> String?
+               | () { (Image::Info) -> void } -> String?
     def write: (File | string file) -> self
-             | (File | string file) { (Image::Info) -> void} -> self
+             | (File | string file) { (Image::Info) -> void } -> self
     def destroy!: () -> self
     def destroyed?: () -> bool
 

data/sig/rmagick/image_list.rbs

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Magick
   class ImageList
     include Enumerable[Image]
     include Comparable
-      # The methods of Magick::Image class can be called via method_missing
-      include _ImageCommonMethods
+    # The methods of Magick::Image class can be called via method_missing
+    include _ImageCommonMethods
 
     private
 
@@ -37,7 +39,7 @@ module Magick
            | (int start, int length, magick_image | Array[Image] image) -> void
     def at: () -> Image
     def each: () -> Enumerator[Image, self]
-            | () { (Image) -> void} -> void
+            | () { (Image) -> void } -> void
     def each_index: () -> Enumerator[Integer, self]
                   | () { (Integer) -> void } -> void
     def empty?: () -> bool
@@ -49,11 +51,11 @@ module Magick
     def hash: () -> Integer
     def include?: (untyped obj) -> bool
     def index: (Image | ImageList | Array[Image] obj) -> ::Integer?
-             | () { (Image) -> bool } -> Integer?
+             | () { (Image) -> boolish } -> Integer?
              | () -> ::Enumerator[Image, Integer?]
     def length: () -> Integer
-    def rindex: (Image | ImageList | Array[Image]  obj) -> ::Integer?
-              | () { (Image) -> bool } -> Integer?
+    def rindex: (Image | ImageList | Array[Image] obj) -> ::Integer?
+              | () { (Image) -> boolish } -> Integer?
               | () -> ::Enumerator[Image, Integer?]
     def sort!: () -> self
              | () { (Image a, Image b) -> Integer } -> self
@@ -62,31 +64,31 @@ module Magick
              | ...
     def collect: () { (Image) -> Image } -> ImageList
     def collect!: () { (Image) -> Image } -> self
-    def copy: -> ImageList
+    def copy: () -> ImageList
             | ...
-    def cur_image: -> Image
+    def cur_image: () -> Image
                  | ...
     alias map collect
     alias __map__ collect
     alias map! collect!
     alias __map__! collect!
-    def compact: -> ImageList
-    def compact!: -> self?
+    def compact: () -> ImageList
+    def compact!: () -> self?
     def concat: (ImageList | Array[Image] other) -> self
     def delay=: (int d) -> void
     def delete: (Image obj) -> Image?
               | [T] (Image obj) { (Image) -> T } -> (Image | T)
     def delete_at: (int ndx) -> Image?
-    def delete_if: () { (Image) -> bool } -> self
+    def delete_if: () { (Image) -> boolish } -> self
                  | () -> self
-    def dup: -> ImageList
+    def dup: () -> ImageList
            | ...
     def eql?: (ImageList | Array[Image] other) -> bool
     def fill: (Image image, ?int start, ?int length) -> ImageList
             | (Image image, Range[Integer] range) -> ImageList
             | (?int start, ?int length) { (Integer index) -> Image } -> ImageList
             | (Range[Integer] range) { (Integer index) -> Image } -> ImageList
-    def find_all: () { (Image) -> bool } -> ImageList
+    def find_all: () { (Image) -> boolish } -> ImageList
                 | () -> ImageList
     alias select find_all
     def from_blob: (string blob) -> self
@@ -97,24 +99,24 @@ module Magick
     def iterations=: (int n) -> void
     def last: () -> Image?
             | (int n) -> ImageList
-    def marshal_dump: () -> (Array[(Integer | String)?])
+    def marshal_dump: () -> Array[(Integer | String)?]
     def marshal_load: (Array[(Integer | String)?] ary) -> void
     def method_missing: (untyped meth_id, *untyped args) ?{ (*untyped, **untyped) -> untyped } -> untyped
     def new_image: (int cols, int rows, ?magick_fill fill) -> self
                  | (int cols, int rows, ?magick_fill fill) { (Image::Info) -> void } -> self
-    def partition: () { (Image) -> bool } -> [ImageList, ImageList]
+    def partition: () { (Image) -> boolish } -> [ImageList, ImageList]
     def ping: (*(File | string) files) -> self
             | (*(File | string) files) { (Image::Info) -> void } -> self
     def pop: () -> Image?
     def push: (*Image objs) -> self
     def read: (*(File | string) files) -> self
             | (*(File | string) files) { (Image::Info) -> void } -> self
-    def reject: () { (Image) -> bool } -> ImageList
-    def reject!: () { (Image) -> bool } -> self?
+    def reject: () { (Image) -> boolish } -> ImageList
+    def reject!: () { (Image) -> boolish } -> self?
     def replace: (ImageList | Array[Image] other) -> ImageList
     def respond_to?: (interned meth_id, ?bool priv) -> bool
-    def reverse: -> ImageList
-    def reverse!: -> self
+    def reverse: () -> ImageList
+    def reverse!: () -> self
     def reverse_each: () { (Image) -> void } -> self
     def shift: () -> Image?
     def slice: (int index) -> ImageList?
@@ -125,7 +127,7 @@ module Magick
               | (Range[Integer] range) -> Image?
     def ticks_per_second=: (int t) -> void
     def to_a: () -> Array[Image]
-    def uniq: -> ImageList
+    def uniq: () -> ImageList
     def uniq!: () -> self?
     def unshift: (Image obj) -> self
     def values_at: (*int index) -> ImageList
@@ -152,7 +154,7 @@ module Magick
     def optimize_layers: (LayerMethod method) -> ImageList
     def quantize: (?int number_colors, ?ColorspaceType colorspace, ?(DitherMethod | bool) dither, ?int tree_depth, ?bool measure_error) -> ImageList
     def to_blob: () -> String?
-               | () { (Image::Info) -> void} -> String?
+               | () { (Image::Info) -> void } -> String?
     def write: (File | string file) -> self
              | (File | string file) { (Image::Info) -> void } -> self
     def destroy!: () -> self

data/sig/rmagick/iptc.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   module IPTC
     module Envelope

data/sig/rmagick/kernel_info.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class KernelInfo
     def self.builtin: (KernelInfoType what, string geometry) -> KernelInfo

data/sig/rmagick/optional_method_arguments.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class OptionalMethodArguments
     attr_writer highlight_color: magick_color

data/sig/rmagick/pixel.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class Pixel
     # TODO:

data/sig/rmagick/struct.rbs

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Magick
   class AffineMatrix < Struct[untyped]
     attr_accessor sx: real

data/sig/rvg/embellishable.rbs

@@ -197,7 +197,7 @@ module Magick
       # Define grouped elements by calling RVG::Embellishable
       # methods within the associated block.
       def g: () -> Group
-           | { (Group) -> void } -> Group
+           | () { (Group) -> void } -> Group
     end
 
     # Methods that construct raster image objects within a container

data/sig/rvg/pathdata.rbs

@@ -20,7 +20,7 @@ module Magick
       def to_s: () -> String
 
       # @private
-      def deep_copy: (?untyped? _h) -> String
+      def deep_copy: (?untyped _h) -> String
 
       # Add a <tt>moveto</tt> command. If <tt>abs</tt> is
       # <tt>true</tt> the coordinates are absolute, otherwise