rmagick 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a3f680362b68b275708ea32ebd9700b921e2dd1d3216392b5f645e5f8a077c
-  data.tar.gz: 8ac64189ef03727863075560f34e7d86c94003ace5fba3881a802b2a4f85a3d8
+  metadata.gz: c5638d3e358ce6dbfdaad27ad6f3a8cbb04a3268e7111be2ab789c2f2252ee8b
+  data.tar.gz: 6e1d9519cd2457071b665deb5c8365ecf9abd3d6bd0fbf187b37435a425d2a7c
 SHA512:
-  metadata.gz: f9b28137370eefdc3131e81681671062be851ec683f3faf387d76f2af7ccfada7eb55a361d30172d491a20ad1a44554815ac3c4220cc8a21dfa5146fbc763d46
-  data.tar.gz: 5893af6874461d876eb7133f57d0a9d5bc141f3bb271e65a74619ac957b75da6e13c0a7b148c494bf2075816346cb2424d97e3f900fe1bc827931160df30c5ba
+  metadata.gz: 752fbabb75ffa6fd6c78bdc3ea40e4605d960d8bbcaeb1040f7594dcb4f474cb613b33e3cfe06fce7f7fdd0f272b999f85cf89d3037a3e9ac5b2e3f0cb66848b
+  data.tar.gz: ceaf487faba530d128138f980d192eef6e79e5814cd2d4ad25d8cd3c1166b49374f10c0dbc6110c11994a9f43e7d4812b207368c14467deda355661ab9a975b5

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+### Description
+<!-- A description of the bug or feature -->
+
+### Steps to Reproduce
+<!-- List of steps, sample code, failing test or link to a project that reproduces the behavior.
+     Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues -->
+
+### System Configuration
+<!-- Tell us about the environment where you are experiencing the bug -->
+
+- ImageMagick version:
+- RMagick version:
+- Environment (Operating system, version and so on):
+- Additional information:
+
+<!-- Thanks for reporting the issue to RMagick! -->

data/.github/workflows/ci.yml

@@ -39,8 +39,8 @@ jobs:
         imagemagick-version:
           - { full: 6.7.7-10, major-minor: '6.7' }
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-0, major-minor: '6.9' }
-          - { full: 7.0.10-0, major-minor: '7.0' }
+          - { full: 6.9.11-2, major-minor: '6.9' }
+          - { full: 7.0.10-2, major-minor: '7.0' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -49,9 +49,9 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ./build-ImageMagick
-        key: v1-imagemagick-${{ matrix.imagemagick-version.full }}
+        key: v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
         restore-keys: |
-          v1-imagemagick-${{ matrix.imagemagick-version.full }}
+          v1-linux-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -78,8 +78,8 @@ jobs:
       matrix:
         ruby-version: [2.6, 2.7]
         imagemagick-version:
-          - { full: 6.9.11-0, major-minor: '6.9' }
-          - { full: 7.0.10-0, major-minor: '7.0' }
+          - { full: 6.9.11-2, major-minor: '6.9' }
+          - { full: 7.0.10-2, major-minor: '7.0' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -92,7 +92,7 @@ jobs:
         restore-keys: |
           v1-macos-imagemagick-${{ matrix.imagemagick-version.full }}
     - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: eregon/use-ruby-action@master
+      uses: ruby/setup-ruby@master
       with:
         ruby-version: ${{ matrix.ruby-version }}
     - name: Update/Install packages
@@ -115,11 +115,11 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6]
+        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
         imagemagick-version:
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-0, major-minor: '6.9' }
-          - { full: 7.0.10-0, major-minor: '7.0' }
+          - { full: 6.9.11-2, major-minor: '6.9' }
+          - { full: 7.0.10-2, major-minor: '7.0' }
     name: MSWin, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.1.1
+
+Bug Fixes:
+
+- Fix bug of signal handling internally (#1189)
+
 ## RMagick 4.1.0
 
 Improvements:

data/before_install_osx.sh

@@ -15,6 +15,7 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
   exit 1
 fi
 
+export HOMEBREW_NO_AUTO_UPDATE=true
 brew install wget pkg-config ghostscript freetype jpeg little-cms2 libomp libpng libtiff libtool libxml2 zlib webp
 
 export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/li"

data/ext/RMagick/rmimage.c

@@ -11049,7 +11049,7 @@ file_arg_rescue(VALUE arg, VALUE raised_exc ATTRIBUTE_UNUSED)
  * @see array_from_images
  */
 
-#if !defined(_WIN32)
+#if defined(__APPLE__)
 void sig_handler(int sig ATTRIBUTE_UNUSED)
 {
 }
@@ -11097,14 +11097,23 @@ rd_image(VALUE class ATTRIBUTE_UNUSED, VALUE file, reader_t reader)
 
     exception = AcquireExceptionInfo();
 
-#if !defined(_WIN32)
-    signal(SIGCHLD, sig_handler);
+#if defined(__APPLE__)
+    struct sigaction act, oldact;
+    act.sa_handler = sig_handler;
+    act.sa_flags = SA_RESTART;
+    if (sigaction(SIGCHLD, &act, &oldact) < 0)
+    {
+        rb_sys_fail("sigaction");
+    }
 #endif
 
     images = (reader)(info, exception);
 
-#if !defined(_WIN32)
-    signal(SIGCHLD, SIG_DFL);
+#if defined(__APPLE__)
+    if (sigaction(SIGCHLD, &oldact, NULL) < 0)
+    {
+        rb_sys_fail("sigaction");
+    }
 #endif
 
     rm_check_exception(exception, images, DestroyOnError);

data/ext/RMagick/rmutil.c

@@ -359,7 +359,6 @@ rm_percentage(VALUE arg, double max)
 {
     double pct;
     char *end;
-    int not_num;
 
     if (!rm_check_num2dbl(arg))
     {
@@ -503,7 +502,6 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
 {
     double fuzz;
     char *end;
-    int not_num;
 
     if (!rm_check_num2dbl(fuzz_arg))
     {
@@ -927,7 +925,7 @@ rm_get_property(const Image *img, const char *property)
  * No Ruby usage (internal function)
  *
  * @param image the image
- * @param property the property name 
+ * @param property the property name
  * @param value the property value
  * @return true if successful, otherwise false
  */

data/lib/rmagick/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -134,6 +134,7 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".editorconfig"
+- ".github/ISSUE_TEMPLATE.md"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"