rmagick 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f03e7c8f9a11d13e6d238c0f9af950c6024f42318c7f877fdedf8754d08afa9
-  data.tar.gz: 8c37ca64ae0b07f2dbf05b8e1bbe670510ca702434a214bee4346d4e89ea86ca
+  metadata.gz: 49c8cb7d9f379a29133d870ab4542f9e30c9f1828343c8dacc466b4795b86bb4
+  data.tar.gz: b3c32bda2622044535255bd080cb16e0fe2d7101f74be85db077cf4057ca8c21
 SHA512:
-  metadata.gz: 64f6253d514ccc95f5dc1d2adcecdee8ccac2590eb113cf1f669b0381656ab3d021f358e394c7477635f2a92a44280ea67fb9c696d6542c6c64329341ba1f746
-  data.tar.gz: 5218852ac35cf26aecb5d8507921da099fb89c642bdf8d3663f2c7022171a9d36a1a96d2b193d688a3be8aa8c6543999e8ea84d1d0f992dbb97ef64cc7d7fe73
+  metadata.gz: 7510f2cbddbccf9c2002b81e42409cf2b59eecf8768bae710ea81bfe5d773e948b841c995d9eca261d249808087ecc72ff4a93f183e5dd77eccef8fb4414224b
+  data.tar.gz: 6570f951140ad45e61d09a8d9183a65f8e5c08d731ccce314c0e79e037c763d86d8bd7cb1f7dd88365e23da55a9b001e547d8004c4df74d0a4c3ff5d5c358d59

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby 2.3
@@ -24,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.12-15, major-minor: '6.9' }
-          - { full: 7.1.0-0, 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:
@@ -55,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.12-15, major-minor: '6.9' }
-          - { full: 7.1.0-0, 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:

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 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

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)

data/ext/RMagick/rmimage.c

@@ -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!

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '4.2.3'
+  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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-10 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.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick