rmagick 4.2.0 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 260708d7b56c2e75a8a67393fc27c96897fd58c473f46c57c1febec5816200e9
-  data.tar.gz: b5b17d6e606f44be1d09986e58988eaad715f2879570a3c16016ff6261cb5bd5
+  metadata.gz: 49c8cb7d9f379a29133d870ab4542f9e30c9f1828343c8dacc466b4795b86bb4
+  data.tar.gz: b3c32bda2622044535255bd080cb16e0fe2d7101f74be85db077cf4057ca8c21
 SHA512:
-  metadata.gz: 1809116920cca2eb49f10412879badd216e2e00819796f4f7fb7d1ebd04792a206363f70d42893d2277260ec2fda028c66c7e33027c4ec6d5591c8826e6114b8
-  data.tar.gz: 9e0edf4cc0afd66eeba825feb37a233e02365daec3737561ab8f101fe7b781953e9bfbe811a88823b66974db6e9a9d1bd1f70175b581b1ddc9691167e2c23a16
+  metadata.gz: 7510f2cbddbccf9c2002b81e42409cf2b59eecf8768bae710ea81bfe5d773e948b841c995d9eca261d249808087ecc72ff4a93f183e5dd77eccef8fb4414224b
+  data.tar.gz: 6570f951140ad45e61d09a8d9183a65f8e5c08d731ccce314c0e79e037c763d86d8bd7cb1f7dd88365e23da55a9b001e547d8004c4df74d0a4c3ff5d5c358d59

data/.github/workflows/ci.yml

@@ -5,13 +5,12 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
+  workflow_dispatch:
 
 jobs:
   lint:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby 2.3
@@ -25,15 +24,15 @@ jobs:
 
   test-linux:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
         imagemagick-version:
           - { full: 6.7.7-10, major-minor: '6.7' }
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-58, major-minor: '6.9' }
-          - { full: 7.0.10-58, major-minor: '7.0' }
+          - { full: 6.9.12-29, major-minor: '6.9' }
+          - { full: 7.1.0-14, major-minor: '7.0' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -56,10 +55,10 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
         imagemagick-version:
-          - { full: 6.9.11-58, major-minor: '6.9' }
-          - { full: 7.0.10-58, major-minor: '7.0' }
+          - { full: 6.9.12-29, major-minor: '6.9' }
+          - { full: 7.1.0-14, major-minor: '7.0' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -75,34 +74,3 @@ jobs:
       run: |
         bundle install --path=vendor/bundle --jobs 4 --retry 3
         bundle exec rake
-
-  test-windows:
-    runs-on: windows-latest
-    timeout-minutes: 10
-    strategy:
-      matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
-        imagemagick-version:
-          - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-29, major-minor: '6.9' } # seems that binary file mirroring have stopped.
-          - { full: 7.0.10-29, major-minor: '7.0' } # seems that binary file mirroring have stopped.
-    name: MSWin, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@master
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-    - name: Install ImageMagick
-      run: |
-        $imagemagick_version = "${{ matrix.imagemagick-version.full }}"
-        $imagemagick_version_without_patch = $imagemagick_version.split("-")[0]
-        $installer_name = "ImageMagick-$($imagemagick_version)-Q16-x64-dll.exe"
-        $url = "https://ftp.icm.edu.pl/pub/graphics/ImageMagick/binaries/$($installer_name)"
-        choco install wget
-        choco install ghostscript -Version 9.50
-        wget $url --progress=dot
-        cmd.exe /D /S /C "$($installer_name) /DIR=D:\ImageMagick /VERYSILENT /TASKS=install_Devel"
-    - name: Build and test with Rake
-      run: |
-        cmd.exe /D /S /C "SET MAKE=make & SET PATH=D:\ImageMagick;%PATH% & bundle install --path=vendor/bundle --retry 3 & bundle exec rake"

data/CHANGELOG.md

@@ -3,8 +3,60 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.2.4
+
+Improvements
+
+- spec_helper: drop require_relative to lib directory (#1306)
+- Fix build error with Ruby 3.1 on macOS (#1313)
+
+Bug Fixes
+
+- remove Mutex in trace_proc= (#1303)
+- channel_mean_spec: fix floating point comparison (#1307)
+- changed_predicate_spec: ensure target directory exists (#1305)
+- Doc: Fix documentation of Magick::Image#crop (#1311)
+- Magick::UndefinedKernel should also not be used when creating a new KernelInfo. (#1312)
+
+## RMagick 4.2.3
+
+Bug Fixes
+
+- Re-add block syntax deprecation warning and fix in RMagick source (#1279) (#1280)
+- Doc: Replace Magick::Montage with Magick::ImageList::Montage (#1281)
+- Update shadow example (#1297)
+- Escape the backslashes in windows error message (#1298)
+- Also set the alpha value of the target pixel (#1299)
+- Set alpha_trait to BlendPixelTrait when the alpha value of the pixel is not opaque. (#1300)
+
+## RMagick 4.2.2
+
+Bug Fixes:
+
+- Remove deprecation warning about block syntax (#1272)
+
+You are still recommended to use the block parameter instead of `self.` but
+we're silencing the deprecation warning until we can get RMagick's code up to
+that standard.
+
+## RMagick 4.2.1
+
+Bug Fixes:
+
+- Fix compilation with optimization on glibc (#1263)
+
 ## RMagick 4.2.0
 
+This adds a deprecation warning when using a block for image operations.
+Instead of setting properties on `self`, you should accept a block argument and
+modify that instead. In a future version we we no longer be binding the block
+to the image.
+
+```diff
+- img.to_blob { self.quality = 75 }
++ img.to_blob { |image| image.quality = 75 }
+```
+
 Improvements:
 
 - Updated error messages if runtime ImageMagick version was not matched with when installed rmagick (#1213)

data/ext/RMagick/extconf.rb

@@ -41,7 +41,6 @@ module RMagick
       {
         magick_version: $magick_version,
         local_libs: $LOCAL_LIBS,
-        cflags: $CFLAGS,
         cppflags: $CPPFLAGS,
         ldflags: $LDFLAGS,
         defs: $defs,
@@ -69,7 +68,6 @@ module RMagick
         check_partial_imagemagick_versions
 
         # Save flags
-        $CFLAGS     = "#{ENV['CFLAGS']} "   + `pkg-config --cflags #{$magick_package}`.chomp
         $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
         $LDFLAGS    = "#{ENV['LDFLAGS']} "  + `pkg-config --libs #{$magick_package}`.chomp
         $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
@@ -96,7 +94,7 @@ module RMagick
 
       end
 
-      $CFLAGS << (have_macro('__GNUC__') ? ' -std=gnu99' : ' -std=c99')
+      $CPPFLAGS << (have_macro('__GNUC__') ? ' -std=gnu99' : ' -std=c99')
     end
 
     def exit_failure(msg)
@@ -258,7 +256,7 @@ module RMagick
         Retry with '--with-opt-dir' option.
         Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
         e.g.
-          gem install rmagick -- '--with-opt-dir=\"C:\Program Files\ImageMagick-6.9.1-Q16\"'
+          gem install rmagick -- '--with-opt-dir=\"C:\\Program Files\\ImageMagick-6.9.1-Q16\"'
       END_MINGW
     end
 

data/ext/RMagick/rmagick.h

@@ -1173,6 +1173,9 @@ extern void   rm_set_user_artifact(Image *, Info *);
 extern void   rm_sync_image_options(Image *, Info *);
 extern void   rm_split(Image *);
 extern void   rm_magick_error(const char *);
+#if defined(IMAGEMAGICK_7)
+extern void   rm_set_pixelinfo_alpha(PixelInfo *, const MagickRealType);
+#endif
 
 //! whether to retain on errors
 typedef enum

data/ext/RMagick/rmilist.c

@@ -428,7 +428,7 @@ ImageList_flatten_images(VALUE self)
  * @overload montage
  *   Creates {Magick::ImageList::Montage} object, yields to block
  *   if present in {Magick::ImageList::Montage} object's scope.
- *   @yield []
+ *   @yield [Magick::ImageList::Montage]
  * 
  * @return [Magick::ImageList] a new image list
  */
@@ -440,7 +440,7 @@ ImageList_montage(VALUE self)
     Image *new_images, *images;
     ExceptionInfo *exception;
 
-    // Create a new instance of the Magick::Montage class
+    // Create a new instance of the Magick::ImageList::Montage class
     montage_obj = rm_montage_new();
     if (rb_block_given_p())
     {
@@ -1009,7 +1009,7 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
  *
  * @overload to_blob
  *   Runs an info parm block if present - the user can specify the image format and depth
- *   @yield []
+ *   @yield [Magick::Image::Info]
  *
  * @return [String] the blob
  */

data/ext/RMagick/rmimage.c

@@ -1990,12 +1990,12 @@ Image_bounding_box(VALUE self)
  *     importantly, you can capture menus or other popups that are independent windows but appear
  *     over the specified window.
  *   @param borders [Boolean] If true, include the border in the image.
- *   @yield []
+ *   @yield [Magick::Image::Info]
  *
  * @return [Magick::Image] a new image
  * @example
- *   img = Image.capture {
- *     self.filename = "root"
+ *   img = Image.capture { |options|
+ *     options.filename = "root"
  *   }
  */
 VALUE
@@ -3104,17 +3104,17 @@ Image_columns(VALUE self)
  *   @param channel [Magick::ChannelType] a ChannelType arguments.
  *
  * @overload compare_channel(image, metric, channel = Magick::AllChannels)
- *   If present a block, compare_channel yields to a block in which you can set optional arguments
- *   by setting attributes on self.
- *   - self.highlight_color = color
+ *   When a block is given, compare_channel yields with a block argument you can optionally use to
+ *   set attributes.
+ *   - options.highlight_color = color
  *     - Emphasize pixel differences with this color. The default is partially transparent red.
- *   - self.lowlight_color = color
+ *   - options.lowlight_color = color
  *     - Demphasize pixel differences with this color. The default is partially transparent white.
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *   @param metric [Magick::MetricType] The desired distortion metric.
  *   @param channel [Magick::ChannelType] a ChannelType arguments.
- *   @yield []
+ *   @yield [Magick::OptionalMethodArguments]
  *
  * @overload compare_channel(image, metric, *channels)
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
@@ -3124,18 +3124,18 @@ Image_columns(VALUE self)
  *   @param *channels [Magick::ChannelType] one or more ChannelType arguments.
  *
  * @overload compare_channel(image, metric, *channels)
- *   If present a block, compare_channel yields to a block in which you can set optional arguments
- *   by setting attributes on self.
- *   - self.highlight_color = color
+ *   When a block is given, compare_channel yields with a block argument you can optionally use to
+ *   set attributes.
+ *   - options.highlight_color = color
  *     - Emphasize pixel differences with this color. The default is partially transparent red.
- *   - self.lowlight_color = color
+ *   - options.lowlight_color = color
  *     - Demphasize pixel differences with this color. The default is partially transparent white.
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *   @param metric [Magick::MetricType] The desired distortion metric.
  *   @param channel [Magick::ChannelType] a ChannelType arguments.
  *   @param *channels [Magick::ChannelType] one or more ChannelType arguments.
- *   @yield []
+ *   @yield [Magick::OptionalMethodArguments]
  *
  * @return [Array] The first element is a difference image, the second is a the value of the
  *   computed distortion represented as a Float.
@@ -4681,26 +4681,26 @@ Image_init_copy(VALUE copy, VALUE orig)
 /**
  * Extract a region of the image defined by width, height, x, y.
  *
- * @overload crop(reset = false, x, y, width, height)
- *   @param reset [Boolean] true if reset the cropped image page canvas and position
+ * @overload crop(x, y, width, height, reset = false)
  *   @param x [Numeric] x position of start of region
  *   @param y [Numeric] y position of start of region
  *   @param width [Numeric] width of region
  *   @param height [Numeric] height of region
- *
- * @overload crop(reset = false, gravity, width, height)
  *   @param reset [Boolean] true if reset the cropped image page canvas and position
+ *
+ * @overload crop(gravity, width, height, reset = false)
  *   @param gravity [Magick::GravityType] the gravity type
  *   @param width [Numeric] width of region
  *   @param height [Numeric] height of region
-
- * @overload crop(reset = false, gravity, x, y, width, height)
  *   @param reset [Boolean] true if reset the cropped image page canvas and position
+
+ * @overload crop(gravity, x, y, width, height, reset = false)
  *   @param gravity [Magick::GravityType] the gravity type
  *   @param x [Numeric] x position of start of region
  *   @param y [Numeric] y position of start of region
  *   @param width [Numeric] width of region
  *   @param height [Numeric] height of region
+ *   @param reset [Boolean] true if reset the cropped image page canvas and position
  *
  * @return [Magick::Image] a new image
  * @see Image#crop!
@@ -5551,17 +5551,16 @@ Image_dissolve(int argc, VALUE *argv, VALUE self)
  *     the source image will be taken into account in the mapping.
  *
  * @overload distort(type, points, bestfit = false)
- *   If present a block, distort yields to a block in which you can set optional arguments by
- *   setting attributes on self.
- *   - self.define("distort:viewport", "WxH+X+Y")
+ *   When a block is given, distort yields with a block argument you can optionally use to set attributes.
+ *   - options.define("distort:viewport", "WxH+X+Y")
  *     - Specify the size and offset of the generated viewport image of the distorted image space. W and
  *       H are the width and height, and X and Y are the offset.
- *   - self.define("distort:scale", N)
+ *   - options.define("distort:scale", N)
  *     - N is an integer factor. Scale the output image (viewport or otherwise) by that factor without
  *       changing the viewed contents of the distorted image. This can be used either for
  *       'super-sampling' the image for a higher quality result, or for panning and zooming around
  *       the image (with appropriate viewport changes, or post-distort cropping and resizing).
- *   - self.verbose(true)
+ *   - options.verbose(true)
  *     - Attempt to output the internal coefficients, and the -fx equivalent to the distortion, for
          expert study, and debugging purposes. This many not be available for all distorts.
  *   @param type [Magick::DistortMethod] a DistortMethod value
@@ -5570,13 +5569,13 @@ Image_dissolve(int argc, VALUE *argv, VALUE self)
  *     image is adjusted to ensure the whole source image will just fit within the final destination
  *     image, which will be sized and offset accordingly.  Also in many cases the virtual offset of
  *     the source image will be taken into account in the mapping.
- *   @yield []
+ *   @yield [Magick::OptionalMethodArguments]
  *
  * @return [Magick::Image] a new image
  * @example
- *   img.distort(Magick::ScaleRotateTranslateDistortion, [0]) do
- *     self.define "distort:viewport", "44x44+15+0"
- *     self.define "distort:scale", 2
+ *   img.distort(Magick::ScaleRotateTranslateDistortion, [0]) do |options|
+ *     options.define "distort:viewport", "44x44+15+0"
+ *     options.define "distort:scale", 2
  *   end
  */
 VALUE
@@ -6882,7 +6881,7 @@ Image_frame(int argc, VALUE *argv, VALUE self)
  * @overload from_blob(blob)
  *   This yields {Magick::Image::Info} to block with its object's scope.
  *   @param blob [String] the blob data
- *   @yield []
+ *   @yield [Magick::Image::Info]
  *
  * @return [Array<Magick::Image>] an array of new images
  * @see Image#to_blob
@@ -8968,7 +8967,7 @@ Image_matte_flood_fill(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
 #if defined(IMAGEMAGICK_7)
-    draw_info->fill.alpha = alpha;
+    rm_set_pixelinfo_alpha(&draw_info->fill, alpha);
 #else
     draw_info->fill.opacity = QuantumRange - alpha;
 #endif
@@ -8979,6 +8978,11 @@ Image_matte_flood_fill(int argc, VALUE *argv, VALUE self)
         target_mpp.red   = (MagickRealType) image->border_color.red;
         target_mpp.green = (MagickRealType) image->border_color.green;
         target_mpp.blue  = (MagickRealType) image->border_color.blue;
+#if defined(IMAGEMAGICK_7)
+        rm_set_pixelinfo_alpha(&target_mpp, (MagickRealType) image->border_color.alpha);
+#else
+        target_mpp.opacity = (MagickRealType) image->border_color.opacity;
+#endif
     }
     else
     {
@@ -8986,6 +8990,11 @@ Image_matte_flood_fill(int argc, VALUE *argv, VALUE self)
         target_mpp.red   = (MagickRealType) target.red;
         target_mpp.green = (MagickRealType) target.green;
         target_mpp.blue  = (MagickRealType) target.blue;
+#if defined(IMAGEMAGICK_7)
+        rm_set_pixelinfo_alpha(&target_mpp, (MagickRealType) target.alpha);
+#else
+        target_mpp.opacity = (MagickRealType) target.opacity;
+#endif
     }
 
 #if defined(IMAGEMAGICK_7)
@@ -10349,11 +10358,11 @@ Image_pixel_interpolation_method_eq(VALUE self, VALUE method)
  *   If present a block, optional arguments may be specified in a block associated with the method.
  *   These arguments control the shadow color and how the label is rendered.
  *   By default the shadow color is gray75. To specify a different shadow color,
- *   use self.shadow_color.
- *   To specify a different border color (that is, the color of the image border) use self.border_color.
+ *   use options.shadow_color.
+ *   To specify a different border color (that is, the color of the image border) use options.border_color.
  *   Both of these methods accept either a color name or a Pixel argument.
  *   @param angle [Float] The resulting image is rotated by this amount, measured in degrees.
- *   @yield []
+ *   @yield [Magick::Image::Info]
  *
  * @return [Magick::Image] a new image
  */
@@ -12325,7 +12334,7 @@ Image_segment(int argc, VALUE *argv, VALUE self)
  *   @return [Hash] the properties
  *
  * @overload properties
- *   @yield []
+ *   @yield [Magick::Image::Info]
  *   @return [Magick::Image] self
  */
 VALUE

data/ext/RMagick/rminfo.c

@@ -2405,7 +2405,7 @@ rm_info_new(void)
  * @overload initialize
  *
  * @overload initialize
- *   @yield []
+ *   @yield [Magick::Image::Info]
  *
  * @return self
  */

data/ext/RMagick/rmmontage.c

@@ -22,7 +22,7 @@
  * No Ruby usage (internal function)
  *
  * Notes:
- *   - If the Magick::Montage#texture method wrote a texture file, the file is
+ *   - If the Magick::ImageList::Montage#texture method wrote a texture file, the file is
  *     deleted here.
  *
  * @param obj the montage object
@@ -73,7 +73,7 @@ Montage_alloc(VALUE class)
 
     if (!montage_info)
     {
-        rb_raise(rb_eNoMemError, "not enough memory to initialize Magick::Montage object");
+        rb_raise(rb_eNoMemError, "not enough memory to initialize Magick::ImageList::Montage object");
     }
 
     montage = ALLOC(Montage);
@@ -439,11 +439,11 @@ Montage_title_eq(VALUE self, VALUE title)
 
 
 /**
- * Return a new Magick::Montage object.
+ * Return a new Magick::ImageList::Montage object.
  *
  * No Ruby usage (internal function)
  *
- * @return a new Magick::Montage object
+ * @return a new Magick::ImageList::Montage object
  */
 VALUE
 rm_montage_new(void)

data/ext/RMagick/rmpixel.c

@@ -172,7 +172,7 @@ VALUE
 Pixel_alpha_eq(VALUE self, VALUE v)
 {
     Pixel *pixel;
- 
+
     rb_check_frozen(self);
     Data_Get_Struct(self, Pixel, pixel);
 #if defined(IMAGEMAGICK_7)
@@ -381,8 +381,8 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
         pp->green   = pixel->green;
         pp->blue    = pixel->blue;
 #if defined(IMAGEMAGICK_7)
-        pp->alpha   = pixel->alpha;
         pp->black   = pixel->black;
+        rm_set_pixelinfo_alpha(pp, pixel->alpha);
 #else
         pp->opacity = pixel->opacity;
 #endif

data/ext/RMagick/rmstruct.c

@@ -285,7 +285,7 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
         ci->color.green = (MagickRealType) pixel.green;
         ci->color.blue = (MagickRealType) pixel.blue;
 #if defined(IMAGEMAGICK_7)
-        ci->color.alpha = (MagickRealType) OpaqueAlpha;
+        rm_set_pixelinfo_alpha(&ci->color, (MagickRealType) OpaqueAlpha);
 #else
         ci->color.opacity = (MagickRealType) OpaqueOpacity;
 #endif
@@ -760,7 +760,7 @@ Import_SegmentInfo(SegmentInfo *segment)
     RB_GC_GUARD(y1);
     RB_GC_GUARD(x2);
     RB_GC_GUARD(y2);
-    
+
     return rb_funcall(Class_Segment, rm_ID_new, 4, x1, y1, x2, y2);
 }
 

data/ext/RMagick/rmutil.c

@@ -12,6 +12,11 @@
 
 #include "rmagick.h"
 #include <errno.h>
+#if defined(_WIN32)
+#include <Windows.h>
+#else
+#include <pthread.h>
+#endif
 
 static VALUE rescue_not_str(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
@@ -853,6 +858,25 @@ rm_magick_error(const char *msg)
     RB_GC_GUARD(mesg);
 }
 
+#if defined(IMAGEMAGICK_7)
+/**
+ * Sets the alpha channel of a pixel color
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param pixel the Pixel
+ * @param value the value
+ */
+void
+rm_set_pixelinfo_alpha(PixelInfo *pixel, const MagickRealType value)
+{
+    pixel->alpha = value;
+    if (value != (MagickRealType) OpaqueAlpha)
+    {
+        pixel->alpha_trait = BlendPixelTrait;
+    }
+}
+#endif
 
 /**
  * Initialize a new ImageMagickError object - store the "loc" string in the
@@ -1889,10 +1913,8 @@ unsigned long long
 rm_current_thread_id()
 {
 #if defined(_WIN32)
-#include <Windows.h>
     return (unsigned long long)GetCurrentThreadId();
 #else
-#include <pthread.h>
     return (unsigned long long)pthread_self();
 #endif
 }

data/lib/rmagick/version.rb

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

data/lib/rmagick_internal.rb

@@ -84,15 +84,12 @@ module Magick
     #     ...
     #   end
     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
-
-        @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
 

data/lib/rvg/rvg.rb

@@ -85,7 +85,7 @@ module Magick
                      @background_image.change_geometry(Magick::Geometry.new(width, height)) do |new_cols, new_rows|
                        bg_image = @background_image.resize(new_cols, new_rows)
                        if bg_image.columns != width || bg_image.rows != height
-                         bg = Magick::Image.new(width, height) { self.background_color = bgcolor }
+                         bg = Magick::Image.new(width, height) { |options| options.background_color = bgcolor }
                          bg_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
                        end
                        bg_image
@@ -96,7 +96,7 @@ module Magick
                  end
       else
         bgcolor = bgfill
-        canvas = Magick::Image.new(Integer(@width), Integer(@height)) { self.background_color = bgcolor }
+        canvas = Magick::Image.new(Integer(@width), Integer(@height)) { |options| options.background_color = bgcolor }
       end
       canvas[:desc] = @desc if @desc
       canvas[:title] = @title if @title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.4
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.7.7 or later
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick