rmagick 4.2.4 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c8cb7d9f379a29133d870ab4542f9e30c9f1828343c8dacc466b4795b86bb4
-  data.tar.gz: b3c32bda2622044535255bd080cb16e0fe2d7101f74be85db077cf4057ca8c21
+  metadata.gz: cd92f37d8a01928beb9e4b44c7f7712dab8b2307c42484253b179e474d363e47
+  data.tar.gz: 1faa1f97938450f4199f3019c7b6848efc7cf4a4e43aa06d218c81fad82e21fe
 SHA512:
-  metadata.gz: 7510f2cbddbccf9c2002b81e42409cf2b59eecf8768bae710ea81bfe5d773e948b841c995d9eca261d249808087ecc72ff4a93f183e5dd77eccef8fb4414224b
-  data.tar.gz: 6570f951140ad45e61d09a8d9183a65f8e5c08d731ccce314c0e79e037c763d86d8bd7cb1f7dd88365e23da55a9b001e547d8004c4df74d0a4c3ff5d5c358d59
+  metadata.gz: 36585f543e7e3edb3f967524e8e6a498d0fb9059adb54e96652bb8ddf2772d51d43a183822dd32149fad24c48001de8073dfac9e7e4a3781fe1c8462c940407a
+  data.tar.gz: 19197353b30bf77c73267bf3d939149dc9e078938382d27e24cada606b0edf4c6c21fae0603d00742301a850f9a959f35fd86f1026b104ba342a990dfe887f9d

data/.devcontainer/Dockerfile

@@ -0,0 +1,14 @@
+ARG RUBY_VERSION
+
+FROM ruby:${RUBY_VERSION}
+
+ARG IMAGEMAGICK_VERSION
+
+RUN mkdir /setup
+ADD *.sh /setup
+
+ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION}
+
+RUN /setup/setup-user.sh
+
+WORKDIR /workspaces/rmagick

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -0,0 +1,11 @@
+{
+  "name": "ImageMagick 6",
+  "build": {
+    "dockerfile": "../Dockerfile",
+    "args": {
+      "RUBY_VERSION": "3.1.2",
+      "IMAGEMAGICK_VERSION": "6.9.12-54"
+    }
+  },
+  "onCreateCommand": "/setup/setup-repo.sh"
+}

data/.devcontainer/ImageMagick7/devcontainer.json

@@ -0,0 +1,11 @@
+{
+  "name": "ImageMagick 7",
+  "build": {
+    "dockerfile": "../Dockerfile",
+    "args": {
+      "RUBY_VERSION": "3.1.2",
+      "IMAGEMAGICK_VERSION": "7.1.0-39"
+    }
+  },
+  "onCreateCommand": "/setup/setup-repo.sh"
+}

data/.devcontainer/setup-repo.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+apt-get update
+apt-get install sudo
+
+bash /workspaces/rmagick/before_install_linux.sh
+
+cd /workspaces/rmagick
+bundle install --path=vendor/bundle --jobs 4 --retry 3

data/.devcontainer/setup-user.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -e
+
+codespaces_bash="$(cat \
+<<'EOF'
+# Codespaces bash prompt theme
+__bash_prompt() {
+    local userpart='`export XIT=$? \
+        && [ ! -z "${GITHUB_USER}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER} " || echo -n "\[\033[0;32m\]\u " \
+        && echo -n "\[\033[0;36m\][IM ${IMAGEMAGICK_VERSION}]" \
+        && [ "$XIT" -ne "0" ] && echo -n "\[\033[1;31m\]➜" || echo -n "\[\033[0m\]➜"`'
+    local gitbranch='`\
+        if [ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ]; then \
+            export BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD 2>/dev/null); \
+            if [ "${BRANCH}" != "" ]; then \
+                echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH}" \
+                && if git ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
+                        echo -n " \[\033[1;33m\]✗"; \
+                fi \
+                && echo -n "\[\033[0;36m\]) "; \
+            fi; \
+        fi`'
+    local lightblue='\[\033[1;34m\]'
+    local removecolor='\[\033[0m\]'
+    PS1="${userpart} ${lightblue}\w ${gitbranch}${removecolor}\$ "
+    unset -f __bash_prompt
+}
+__bash_prompt
+
+__show_notice() {
+  local __message="
+\033[0;32mWelcome to Codespaces! You are using the pre-configured rmagick image.\033[0m
+
+\033[0;35mTests can be executed with:\033[0m bundle exec rake
+\033[0;35mCode style can be checked with:\033[0m STYLE_CHECKS=true bundle exec rubocop
+"
+  echo -e "$__message"
+
+  unset -f __show_notice
+}
+__show_notice
+EOF
+)"
+
+ echo "${codespaces_bash}" >> "/root/.bashrc"

data/.github/workflows/ci.yml

@@ -7,12 +7,15 @@ on:
   pull_request:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby 2.3
       uses: ruby/setup-ruby@master
       with:
@@ -31,12 +34,12 @@ jobs:
         imagemagick-version:
           - { full: 6.7.7-10, major-minor: '6.7' }
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.12-29, major-minor: '6.9' }
-          - { full: 7.1.0-14, major-minor: '7.0' }
+          - { full: 6.9.12-56, major-minor: '6.9' }
+          - { full: 7.1.0-41, major-minor: '7.0' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:
@@ -57,12 +60,12 @@ jobs:
       matrix:
         ruby-version: ['2.6', '2.7', '3.0', '3.1']
         imagemagick-version:
-          - { full: 6.9.12-29, major-minor: '6.9' }
-          - { full: 7.1.0-14, major-minor: '7.0' }
+          - { full: 6.9.12-56, major-minor: '6.9' }
+          - { full: 7.1.0-41, major-minor: '7.0' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@master
       with:

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.2.6
+
+Improvements
+
+- Remove test_files to reduce gem package size (#1338)
+
+Bug Fixes
+
+- Guard against an empty rpath (#1333)
+- Call GetImageDistortion instead of IsImagesEqual to fix the issue reported in #1342 (#1343)
+
+## RMagick 4.2.5
+
+Bug Fixes
+
+- Specify rpath linker option to fix dynamic lib lookup failure on Linux (#1325)
+- Fix Image#profile! that can't delete exif data (#1326)
+
 ## RMagick 4.2.4
 
 Improvements

data/README.md

@@ -197,6 +197,8 @@ export LD_LIBRARY_PATH=/usr/local/lib
 On Linux, see `ld(1)` and `ld.so(8)` for more information. On other operating
 systems, see the documentation for the dynamic loading facility.
 
+This operation might not be required when you can use 4.2.5 or later.
+
 ### Segmentation fault
 
 Default stack size of your operating system might be too small. Try removing

data/before_install_linux.sh

@@ -41,7 +41,7 @@ build_imagemagick() {
   mkdir -p build-ImageMagick
 
   version=(${IMAGEMAGICK_VERSION//./ })
-  wget "https://imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  wget "https://imagemagick.org/archive/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   tar -xf "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   rm "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   mv "ImageMagick-${IMAGEMAGICK_VERSION}" "${build_dir}"

data/before_install_osx.sh

@@ -19,7 +19,7 @@ export HOMEBREW_NO_AUTO_UPDATE=true
 brew install wget pkg-config ghostscript freetype jpeg little-cms2 libomp libpng libtiff liblqr libtool libxml2 zlib webp
 
 export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/lib"
-export CPPFLAGS="-I/usr/local/opt/libxml2/include/libxml2 -I/usr/local/opt/zlib/include"
+export CPPFLAGS="-I/usr/local/opt/libxml2/include -I/usr/local/opt/zlib/include"
 
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
@@ -31,7 +31,7 @@ build_imagemagick() {
   mkdir -p build-ImageMagick
 
   version=(${IMAGEMAGICK_VERSION//./ })
-  wget "https://imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  wget "https://imagemagick.org/archive/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   tar -xf "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   rm "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   mv "ImageMagick-${IMAGEMAGICK_VERSION}" "${build_dir}"

data/ext/RMagick/extconf.rb

@@ -67,10 +67,19 @@ module RMagick
         check_multiple_imagemagick_versions
         check_partial_imagemagick_versions
 
+        libdir  = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
+        ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
+        rpath   = libdir.empty? ? '' : "-Wl,-rpath,#{libdir}"
+
         # Save flags
         $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
+        $LDFLAGS    = "#{ldflags} #{rpath}"
+
+        unless try_link("int main() { }")
+          # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
+          $LDFLAGS = ldflags
+        end
 
         configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
 

data/ext/RMagick/rmagick.h

@@ -434,9 +434,9 @@ EXTERN unsigned long long rm_main_thread_id;
 #define R_boolean_to_C_boolean(attr) RTEST(attr) /**<  C boolean <- Ruby boolean */
 #define C_int_to_R_int(attr) INT2FIX(attr) /**< C int -> Ruby int */
 #define R_int_to_C_int(attr) NUM2INT(attr) /**< C int <- Ruby int */
-#define C_long_to_R_long(attr) INT2NUM(attr) /**< C long -> Ruby long */
+#define C_long_to_R_long(attr) LONG2NUM(attr) /**< C long -> Ruby long */
 #define R_long_to_C_long(attr) NUM2LONG(attr) /**< C long <- Ruby long */
-#define C_ulong_to_R_ulong(attr) UINT2NUM(attr) /**< C unsigned long -> Ruby unsigned long */
+#define C_ulong_to_R_ulong(attr) ULONG2NUM(attr) /**< C unsigned long -> Ruby unsigned long */
 #define R_ulong_to_C_ulong(attr) NUM2ULONG(attr) /**< C unsigned long <- Ruby unsigned long */
 #define C_str_to_R_str(attr) attr ? rb_str_new2(attr) : Qnil /**< C string -> Ruby string */
 #define C_dbl_to_R_dbl(attr) rb_float_new(attr) /**< C double -> Ruby double */

data/ext/RMagick/rmimage.c

@@ -5039,8 +5039,16 @@ VALUE
 Image_delete_profile(VALUE self, VALUE name)
 {
     Image *image = rm_check_frozen(self);
-    DeleteImageProfile(image, StringValueCStr(name));
 
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception = AcquireExceptionInfo();
+
+    ProfileImage(image, StringValueCStr(name), NULL, 0, exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
+#else
+    ProfileImage(image, StringValueCStr(name), NULL, 0, MagickTrue);
+#endif
     return self;
 }
 
@@ -5197,6 +5205,7 @@ Image_difference(VALUE self, VALUE other)
     Image *image2;
     VALUE mean, nmean, nmax;
 #if defined(IMAGEMAGICK_7)
+    double distortion;
     ExceptionInfo *exception;
 #endif
 
@@ -5206,7 +5215,7 @@ Image_difference(VALUE self, VALUE other)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    IsImagesEqual(image, image2, exception);
+    GetImageDistortion(image, image2, MeanErrorPerPixelErrorMetric, &distortion, exception);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 #else

data/ext/RMagick/rmstruct.c

@@ -672,10 +672,10 @@ Import_RectangleInfo(RectangleInfo *rect)
     VALUE height;
     VALUE x, y;
 
-    width  = UINT2NUM(rect->width);
-    height = UINT2NUM(rect->height);
-    x      = INT2NUM(rect->x);
-    y      = INT2NUM(rect->y);
+    width  = ULONG2NUM(rect->width);
+    height = ULONG2NUM(rect->height);
+    x      = LONG2NUM(rect->x);
+    y      = LONG2NUM(rect->y);
 
     RB_GC_GUARD(width);
     RB_GC_GUARD(height);

data/lib/rmagick/version.rb

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

data/rmagick.gemspec

@@ -15,18 +15,16 @@ Gem::Specification.new do |s|
 
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   file_exclusion_regex = %r{\A(doc|benchmarks|examples|spec|lib/rvg/to_c.rb)}
-  files         = tracked_files.reject { |file| file[file_exclusion_regex] }
-  test_files    = files.grep(%r{^(test|spec|features)/})
+  files = tracked_files.reject { |file| file[file_exclusion_regex] }
 
-  s.files                       = files
-  s.test_files                  = test_files
+  s.files = files
   s.require_paths << 'ext' << 'deprecated'
 
   s.extensions = %w[ext/RMagick/extconf.rb]
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
 
-  s.add_development_dependency 'pry', '~> 0.12.2'
+  s.add_development_dependency 'pry', '~> 0.14'
   s.add_development_dependency 'rake-compiler', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.6
 platform: ruby
 authors:
 - Tim Hunter
 - Omer Bar-or
 - Benjamin Thomas
 - Moncef Maiza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,11 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".devcontainer/Dockerfile"
+- ".devcontainer/ImageMagick6/devcontainer.json"
+- ".devcontainer/ImageMagick7/devcontainer.json"
+- ".devcontainer/setup-repo.sh"
+- ".devcontainer/setup-user.sh"
 - ".editorconfig"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/workflows/ci.yml"
@@ -202,7 +207,7 @@ homepage: https://github.com/rmagick/rmagick
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick 6.7.7 or later
 rubygems_version: 3.2.32
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []