rmagick 6.2.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76f2e11d828e48371aa5ff6b599cebff2e793b3751892cc864cd22015781c324
-  data.tar.gz: 65fa64db84769aa12a954bdd57ea7e03b8fcb61c1cebab89b2f9d833e8aab0aa
+  metadata.gz: 0b8378b6521fc857bfee81cb0b0d234cbacd0ea753d2f9be41180f1d4f833086
+  data.tar.gz: 6492cec6f6802500827e3e0d3b0c2c30b5ab7c000b3c4da68cf5af5dd3b856c1
 SHA512:
-  metadata.gz: 1238aaf7239bf0ae5041682b6941fb52341283d6e8fe73c37d4c914e21c40a565d0f244fb923289647dc44d0f43bfbf2e0cd59e4a8ee99595ea32524b35bbd26
-  data.tar.gz: ba83bde0c15f3061ad9e0d656cc79a65985fc55b49ae340f7fa3fd2ef510127610d95d2d8692c2111a97b3f4673badd1a03f18d6b78abbbb169f30020bcbdd4b
+  metadata.gz: 70fdb4d672961ba027ec56396813d81aa7101e32d3d0b73a42e28e12b779777e27a63e061d2fdcb82ee5ada9ceede1d3cf1f4124b51a62962e6c1eef656a3f66
+  data.tar.gz: b436f377627611cab9ca86f0b59e2fc8a9a9e8cbd3071fa06036ac841fe136717430851f2043aeaf31175835afab285c5dd2cd3efd5f8de51a8f58cdb38bb595

data/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.0.0
+
+Breaking Changes
+
+* Drop support for Ruby 3.1 and older (#1749)
+* Drop support for old ImageMagick (6.8.x and 7.0.x) (#1748)
+
+Improvements
+
+* Modernize argument parsing using keyword arguments API (#1754)
+* Fix floating-point truncation in Magick::TypeMetric coordinates (#1765)
+* Fix floating-point truncation in Magick::ChromaticityInfo coordinates (#1241)
+
+## RMagick 6.3.0
+
+> [!IMPORTANT]
+> This release is the final minor update for the RMagick 6 series.
+>
+> The upcoming RMagick 7.0 will require:
+>  * Ruby 3.2 or later
+>  * ImageMagick 6.9 or later (for ImageMagick 6 users)
+>  * ImageMagick 7.1 or later (for ImageMagick 7 users)
+
+Enhancements
+
+- Add deprecation warnings for upcoming RMagick 7.0 (#1740)
+
 ## RMagick 6.2.0
 
 Improvements

data/Gemfile

@@ -16,9 +16,8 @@ gem 'rubocop', '~> 1.63'
 gem 'rubocop-performance', '~> 1.21'
 gem 'rubocop-rspec', '~> 3.5'
 
-gem 'rubocop-on-rbs', '~> 1.5' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2')
-
-gem 'rbs', '~> 3.4'
-gem 'steep', '~> 1.6'
+gem 'rbs', '~> 4.0'
+gem 'rubocop-on-rbs', '~> 2.0'
+gem 'steep', '~> 2.0'
 
 gem 'ruby_memcheck', '~> 3.0' if RUBY_PLATFORM.include?('linux')

data/README.md

@@ -7,18 +7,18 @@ RMagick
 Table of Contents
 -----------------
 
--   [Introduction](#introduction)
--   [Prerequisites](#prerequisites)
--   [Installing RMagick](#installing-rmagick)
--   [Using RMagick](#using-rmagick)
--   [Things that can go wrong](#things-that-can-go-wrong)
--   [Upgrading](#upgrading)
--   [More samples](#more-samples)
--   [Reporting Bugs](#reporting-bugs)
--   [Development Setup](#development-setup)
--   [Credits](#credits)
--   [License](#mit-license)
--   [Releasing](#releasing)
+- [Introduction](#introduction)
+- [Prerequisites](#prerequisites)
+- [Installing RMagick](#installing-rmagick)
+- [Using RMagick](#using-rmagick)
+- [Things that can go wrong](#things-that-can-go-wrong)
+- [Upgrading](#upgrading)
+- [More samples](#more-samples)
+- [Reporting Bugs](#reporting-bugs)
+- [Development Setup](#development-setup)
+- [Credits](#credits)
+- [License](#license)
+- [Releasing](#releasing)
 
 Introduction
 ------------
@@ -42,31 +42,31 @@ These prerequisites are required for the latest version of RMagick.
 - RMagick 5.4.0 or later requires a C++ compiler.
 
 **Ruby**
-- Version 3.0 or later.
+- Version 3.2 or later.
 
 You can get Ruby from <https://www.ruby-lang.org>.
 
-Ruby must be able to build C-Extensions (e.g. MRI, Rubinius, not JRuby)
+Ruby must be able to build C-Extensions (e.g. MRI, not JRuby)
 
 **ImageMagick**
-- Version 6.8.9 or later (6.x.x).
-- Version 7.0.8 or later (7.x.x). Require RMagick 4.1.0 or later.
+- Version 6.9 or later (for ImageMagick 6 users).
+- Version 7.1 or later (for ImageMagick 7 users).
 
 You can get ImageMagick from <https://imagemagick.org>.
 
 ### Linux
-#### Ubuntu
-On Ubuntu, you can run:
+#### Debian-based
+On Debian-based, you can run:
 
 ```sh
-sudo apt-get install libmagickwand-dev
+apt install libmagickwand-dev
 ```
 
-#### Centos
-On Centos, you can run:
+#### RHEL-compatible
+On RHEL-compatible, you can run:
 
 ```sh
-sudo yum install ImageMagick-devel
+dnf install ImageMagick-devel
 ```
 
 #### Arch Linux
@@ -176,9 +176,9 @@ ridk exec gem install rmagick
 
 ### Versioning
 
-RMagick is versioned according to Semantic Versioning. For stable version
-compatible with Ruby 3.0+, use `~> 3.0`. Versions >= 6 work on Ruby >= 3.x
-only.
+RMagick is versioned according to Semantic Versioning.
+Versions >= 7 work on Ruby >= 3.2 only.
+For older Ruby versions, use RMagick `~> 6.0`.
 
 Using RMagick
 -------------
@@ -261,69 +261,52 @@ via the bug tracker on the [RMagick issues page][issues].
 However, We can't help with Ruby installation and configuration or ImageMagick
 installation and configuration. Information about reporting problems and
 getting help for ImageMagick is available at the [ImageMagick
-website][imagemagick] or the [ImageMagick Forum][imagemagick-forum].
+website][imagemagick] or the [ImageMagick Discussions][imagemagick-discussions].
 
 Development Setup
 -----------------
 
 In order to minimize issues on your local machine, we recommend that you make
-use of a [Vagrant installation][dev-box].
+use of [Dev Containers](https://containers.dev/). This provides a consistent, pre-configured development environment using Docker.
 
 Steps to get up and running with a passing build are as follows:
 
-### 1) set up the Vagrant environment
+### 1) Set up the prerequisites
 
-If you don't already have Vagrant installed, you can download and install it
-from [here][vagrant]. Once installed, we can set up a pre-built environment:
+To use Dev Containers, you will need to install the following tools on your machine:
+* [Docker Desktop](https://www.docker.com/products/docker-desktop/) (or Docker Engine)
+* [Visual Studio Code](https://code.visualstudio.com/)
+* [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) for VS Code
 
-```sh
-git clone https://github.com/tjschuck/rake-compiler-dev-box.git
-cd rake-compiler-dev-box
-vagrant up
-```
-
-This last part will probably take a while as it has to download an Ubuntu image
-and configure it. If there is an error during this process, you may need to
-reboot your computer and enable virtualization in your BIOS settings.
-
-### 2) clone RMagick and log in to the vagrant box
+### 2) Clone RMagick and open the container
 
-Within the `rake-compiler-dev-box` directory:
+Clone the repository to your local machine and open it in VS Code:
 
 ```sh
 git clone https://github.com/rmagick/rmagick.git # or your fork
-vagrant ssh
+cd rmagick
+code .
 ```
 
-### 3) install ImageMagick and additional environment stuff
+Once VS Code opens, it should detect the `.devcontainer` configuration and prompt you to "Reopen in Container".
 
-```sh
-cd /vagrant/rmagick
-export IMAGEMAGICK_VERSION=6.8.9-10
-bash ./before_install_linux.sh
-```
+During this process, VS Code will ask you to select a `devcontainer.json` configuration. You can choose the environment you want to develop and test against:
 
-This will take just a few minutes to build ImageMagick
+* ImageMagick 7 (`.devcontainer/devcontainer.json`) - Recommended for the latest development.
+* ImageMagick 6 (`.devcontainer/ImageMagick6/devcontainer.json`) - For testing against the legacy ImageMagick 6 API.
 
-### 4) build RMagick
+Select the one you need, and VS Code will automatically build the corresponding Docker image and start your isolated development environment. This may take a few minutes the first time.
 
-```sh
-rake
-```
-
-This compiles the RMagick extensions and runs the tests. If all goes well
-you'll see a lot of output, eventually ending in something like:
-
-```sh
-Finished tests in 35.865734s, 11.3758 tests/s, 6560.3007 assertions/s.
+### 3) Build RMagick
+Once the container is running and the ImageMagick setup is complete, open a new terminal inside VS Code.
+Install the Ruby dependencies and compile the RMagick extension:
 
-408 tests, 235290 assertions, 0 failures, 0 errors, 0 skips
+```
+$ bundle install
+$ bundle exec rake
 ```
 
-And you're all set! The copy of RMagick within `/vagrant/rmagick` inside your
-Vagrant session is the same as the one in the `rake-compiler-dev-box` directory
-on your machine. You can make changes locally and run tests within your `ssh`
-session.
+And you're all set! The codebase on your local machine is automatically synced with the container. You can edit files using your local VS Code, and run tests seamlessly within the integrated container terminal.
 
 Credits
 -------
@@ -341,8 +324,6 @@ License
 Releasing
 ---------
 
-See <https://github.com/rmagick/rmagick/wiki/Release-Process>
-
 1.  Update ChangeLog
 2.  Edit `lib/rmagick/version.rb`
 3.  Are the tests passing? Run `rake` again just to be sure.
@@ -352,6 +333,4 @@ See <https://github.com/rmagick/rmagick/wiki/Release-Process>
 [libmagick-faq]: https://web.archive.org/web/20140512193354/https://rmagick.rubyforge.org/install-faq.html#libmagick
 [faq]: https://web.archive.org/web/20140512193354/https://rmagick.rubyforge.org/install-faq.html
 [imagemagick]: https://imagemagick.org
-[imagemagick-forum]: https://imagemagick.org/discourse-server
-[dev-box]: https://github.com/tjschuck/rake-compiler-dev-box
-[vagrant]: https://www.vagrantup.com/
+[imagemagick-discussions]: https://github.com/ImageMagick/ImageMagick/discussions

data/Rakefile

@@ -194,11 +194,4 @@ if RUBY_PLATFORM.include?('linux')
 end
 
 task spec: :compile
-
-if ENV['STYLE_CHECKS']
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
-  task default: %i[rubocop]
-else
-  task default: %i[spec]
-end
+task default: :spec

data/ext/RMagick/extconf.rb

@@ -11,7 +11,7 @@ module RMagick
     RMAGICK_VERS = ::Magick::VERSION
     MIN_RUBY_VERS = ::Magick::MIN_RUBY_VERSION
 
-    # ImageMagick 6.8+ packages
+    # ImageMagick 6 packages
     IM6_PACKAGES = %w[
       ImageMagick-6.Q64HDRI
       ImageMagick-6.Q32HDRI
@@ -259,16 +259,22 @@ module RMagick
 
       # Ensure minimum ImageMagick version
       # Check minimum ImageMagick version if possible
-      checking_for("outdated ImageMagick version (<= #{Magick::MIN_IM_VERSION})") do
+      checking_for("outdated ImageMagick version") do
         Logging.message("Detected ImageMagick version: #{$magick_version}\n")
 
-        exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n" if Gem::Version.new($magick_version) < Gem::Version.new(Magick::MIN_IM_VERSION)
+        required_version = im_version_at_least?('7.0.0') ? Magick::MIN_IM7_VERSION : Magick::MIN_IM6_VERSION
+
+        if Gem::Version.new($magick_version) < Gem::Version.new(required_version)
+          exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{required_version} or later.\n"
+        end
+
+        false
       end
     end
 
     def create_header_file
       ruby_api = [
-        'rb_io_path' # Ruby 3.2.0
+        'rb_io_path' # Ruby 3.3.0
       ]
       memory_api = %w[
         posix_memalign
@@ -277,7 +283,6 @@ module RMagick
         _aligned_msize
       ]
       imagemagick_api = [
-        'GetImageChannelEntropy', # 6.9.0-0
         'SetImageGray', # 6.9.1-10
         'SetMagickAlignedMemoryMethods' # 7.0.9-0
       ]
@@ -291,11 +296,8 @@ module RMagick
       $defs.push("-DRUBY_VERSION_STRING=\"ruby #{RUBY_VERSION}\"")
       $defs.push("-DRMAGICK_VERSION_STRING=\"RMagick #{RMAGICK_VERS}\"")
 
-      $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0=1') if im_version_at_least?('6.9.0')
       $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_9_10=1') if im_version_at_least?('6.9.10')
       $defs.push('-DIMAGEMAGICK_7=1') if im_version_at_least?('7.0.0')
-      $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_0_8=1') if im_version_at_least?('7.0.8')
-      $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_0_10=1') if im_version_at_least?('7.0.10')
       $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_7_1_2=1') if im_version_at_least?('7.1.2')
 
       create_header

data/ext/RMagick/rmagick.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * Contains Magick module methods.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Magick module methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmagick.cpp
- * @version  $Id: rmagick.cpp,v 1.4 2009/12/20 02:33:32 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 

data/ext/RMagick/rmagick.h

@@ -1,14 +1,13 @@
-/**************************************************************************//**
+/**
  * RMagick declarations and definitions.
  *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
- *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmagick.h
- * @version  $Id: rmagick.h,v 1.282 2010/02/16 06:50:28 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #ifndef _RMAGICK_H_
 #define _RMAGICK_H_
@@ -837,11 +836,7 @@ extern VALUE Image_compare_channel(int, VALUE *, VALUE);
 extern VALUE Image_channel_depth(int, VALUE *, VALUE);
 extern VALUE Image_channel_extrema(int, VALUE *, VALUE);
 extern VALUE Image_channel_mean(int, VALUE *, VALUE);
-#if defined(HAVE_GETIMAGECHANNELENTROPY) || defined(IMAGEMAGICK_7)
 extern VALUE Image_channel_entropy(int, VALUE *, VALUE);
-#else
-extern VALUE Image_channel_entropy(int, VALUE *, VALUE) ATTRIBUTE_NORETURN;
-#endif
 extern VALUE Image_charcoal(int, VALUE *, VALUE);
 extern VALUE Image_chop(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_clone(VALUE);
@@ -1177,7 +1172,6 @@ extern double rm_str_to_pct(VALUE, bool);
 extern VALUE  rm_define_enum_type(const char *);
 extern void   rm_write_temp_image(Image *, char *, size_t);
 extern void   rm_delete_temp_image(char *);
-extern void   rm_not_implemented(void) ATTRIBUTE_NORETURN;
 extern void   rm_attr_write(VALUE, VALUE);
 extern const char *rm_get_property(const Image *, const char *);
 extern MagickBooleanType rm_set_property(Image *, const char *, const char *);
@@ -1218,13 +1212,6 @@ extern VALUE  rm_io_path(VALUE);
 extern void   rm_check_image_exception(Image *, ErrorRetention);
 #endif
 
-#if !defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0)
-/* UnityAddKernelInfo() was private function until IM 6.9 */
-MagickExport void UnityAddKernelInfo(KernelInfo *kernel, const double scale);
-/* ScaleKernelInfo() was private function until IM 6.9 */
-MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor, const GeometryFlags normalize_flags);
-#endif
-
 #define RESCUE_FUNC(func)                   (VALUE(*)(VALUE))(func)
 #define RESCUE_EXCEPTION_HANDLER_FUNC(func) (VALUE(*)(VALUE, VALUE))(func)
 

data/ext/RMagick/rmdraw.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * Contains Draw class methods.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Draw class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmdraw.cpp
- * @version  $Id: rmdraw.cpp,v 1.83 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 #include "float.h"

data/ext/RMagick/rmenum.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
+/**
  * Enumeration methods.
  *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
- *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmenum.cpp
- * @version  $Id: rmenum.cpp,v 1.9 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 

data/ext/RMagick/rmfill.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * GradientFill, TextureFill class definitions for RMagick.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * GradientFill, TextureFill class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmfill.cpp
- * @version  $Id: rmfill.cpp,v 1.33 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 
@@ -807,4 +806,3 @@ TextureFill_fill(VALUE self, VALUE image_obj)
 
     return self;
 }
-

data/ext/RMagick/rmilist.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * ImageList class method definitions for RMagick.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * ImageList class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmilist.cpp
- * @version  $Id: rmilist.cpp,v 1.94 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"