rmagick 7.1.5 → 7.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0652dce5387352787bef0e59b1548a5c36b6f80a66b8ec9ab4c7f03828f5d0f
-  data.tar.gz: 6d286a5f5649816c5cf1f821969783fb6ebef9f5a81b4502719f498869f926f9
+  metadata.gz: 66dc89800cb00f2289dabc151894c15c87bfb01d231e59a65e416ea340891806
+  data.tar.gz: a77148f0f14029e5eaab407e4c7a92b2f001c3d1b7d2a3bccaed2895f76a73a8
 SHA512:
-  metadata.gz: 4ab4ce5e26eed8275df1cdc1130da0c5bb717fdca8f472c89b26a5aea37579a17e9bc4d9a34aa0c272a4b26242c03c2acbd9b690484b503ddfdf7220fc075cf2
-  data.tar.gz: c5ee3eddbed492432ae70f34680a3d9a768fec6ba33bd3c97eca98262f29fd81d2037f56f8e8018ee0afc0a43896ad7186ee5f779da559f9d14ccc05aa28c3cb
+  metadata.gz: d39124bed163f3af7ac90f2a40476735e653a957307e9c4bb88c96f13899c6644d7af005c7a7546028bec6652c0cc0f5af2f18c3fcbc0148d660c16fa3543cbd
+  data.tar.gz: eb6b1420cf8b1d112931dc4467163817eac4ca3f87ca4e52b7b7d0e4eef322ab062554eb9e71545553ea2352a512d208e68512a0994b98ce6da3edbad09ec589

data/CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.1.7
+
+Bug Fixes
+
+* Fix installing the gem with the system Ruby on Ubuntu 26.04, whose LDFLAGS contain '%' (#1927)
+
+## RMagick 7.1.6
+
+> [!IMPORTANT]
+> A `Magick::KernelInfo` kernel string starting with `@` now raises `ArgumentError`.
+>
+> `KernelInfo.new`, and `Image#morphology` and `#morphology_channel` when given a string kernel, passed the string to ImageMagick, which reads the kernel from the file a string starting with `@` names. A kernel string taken from user input could therefore read any file the process can open: a file holding a kernel definition changed the result image, and with ImageMagick 7 the error told whether the path exists. The message is "the kernel must not name a file with '@'", as for the other values that reject `@`.
+
+Breaking Changes
+
+* Reject a KernelInfo kernel string beginning with '@' instead of reading that file (#1895)
+
+Improvements
+
+* Add Magick.resource_usage to read how much of a resource ImageMagick uses (#1880)
+* Add the methods, classes and fields missing from the API reference, and fix the entries that disagreed with the code (#1881, #1883-#1891, #1893, #1897, #1899)
+
+Bug Fixes
+
+* Fix RBS signatures that disagree with the implementation (#1901)
+* Fix clone of Image, Draw, Pixel, KernelInfo and ImageList rejecting the freeze keyword (#1900)
+* Fix resample and resize sharpening the image at blur 1.0 with ImageMagick 7 (#1898)
+* Fix KernelInfo.builtin leaving out ImageMagick's default arguments (#1896)
+* Fix mutating a frozen Magick::KernelInfo and a leak in KernelInfo#initialize (#1894)
+* Fix TypeMetric#underline_thickness returning the underline position (#1892)
+
 ## RMagick 7.1.5
 
 > [!IMPORTANT]

data/ext/RMagick/extconf.rb

@@ -134,7 +134,7 @@ module RMagick
     def exit_failure(msg)
       msg = "ERROR: #{msg}"
 
-      Logging.message msg
+      Logging.message "%s", msg
 
       @stdout.puts "\n\n"
       if ENV['NO_COLOR']
@@ -172,11 +172,11 @@ module RMagick
       return if packages.empty?
 
       msg = "\nDetected ImageMagick packages:\n"
-      Logging.message msg
-      message msg
+      Logging.message "%s", msg
+      message "%s", msg
       package_paths = packages.map { |package| "- #{PKGConfig.package_config(package).pc_path}" }.join("\n")
-      Logging.message package_paths + "\n\n"
-      message package_paths + "\n\n"
+      Logging.message "%s", package_paths + "\n\n"
+      message "%s", package_paths + "\n\n"
 
       if installed_im6_packages.any? && installed_im7_packages.any?
         checking_for('forced use of ImageMagick 6') do
@@ -192,8 +192,8 @@ module RMagick
 
       if packages.length > 1
         msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n\n"
-        Logging.message msg
-        message msg
+        Logging.message "%s", msg
+        message "%s", msg
       end
 
       packages.first
@@ -201,8 +201,8 @@ module RMagick
 
     def search_paths_for_windows
       msg = 'searching PATH for the ImageMagick library...'
-      Logging.message msg
-      message msg + "\n"
+      Logging.message "%s", msg
+      message "%s", msg + "\n"
 
       found = false
       dir_paths = {}
@@ -261,7 +261,7 @@ module RMagick
       # Ensure minimum ImageMagick version
       # Check minimum ImageMagick version if possible
       checking_for("outdated ImageMagick version") do
-        Logging.message("Detected ImageMagick version: #{$magick_version}\n")
+        Logging.message("%s", "Detected ImageMagick version: #{$magick_version}\n")
 
         required_version = im_version_at_least?('7.0.0') ? Magick::MIN_IM7_VERSION : Magick::MIN_IM6_VERSION
 
@@ -354,8 +354,8 @@ module RMagick
 
       END_SUMMARY
 
-      Logging.message summary
-      message summary
+      Logging.message "%s", summary
+      message "%s", summary
     end
   end
 end
@@ -363,8 +363,8 @@ end
 extconf = RMagick::Extconf.new
 at_exit do
   msg = "Configured compile options: #{extconf.configured_compile_options}"
-  Logging.message msg
-  message msg + "\n"
+  Logging.message "%s", msg
+  message "%s", msg + "\n"
 end
 extconf.create_makefile_file
 extconf.create_compile_flags_txt

data/ext/RMagick/rmagick.cpp

@@ -196,35 +196,24 @@ Magick_init_formats(VALUE klass ATTRIBUTE_UNUSED)
 
 
 /**
- * Get/set resource limits. If a limit is specified the old limit is set to the
- * new value. Either way the current/old limit is returned.
- *
- * @overload limit_resource(resource)
- *   Get resource limits.
- *   @param resource [String, Symbol] the type of resource
+ * Convert the name of a resource to its ResourceType.
  *
- * @overload limit_resource(resource, limit)
- *   Set resource limits.
- *   @param resource [String, Symbol] the type of resource
- *   @param limit [Numeric] the new limit number
+ * No Ruby usage (internal function)
  *
- * @return [Numeric] the old limit.
+ * @param resource the name of the resource, a String or Symbol
+ * @return the resource type, or UndefinedResource for nil or an empty string
  */
-VALUE
-Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
+static ResourceType
+resource_type(VALUE resource)
 {
-    VALUE resource, limit;
     ResourceType res = UndefinedResource;
     char *str;
     ID id;
-    MagickSizeType cur_limit;
-
-    rb_scan_args(argc, argv, "11", &resource, &limit);
 
     switch (TYPE(resource))
     {
         case T_NIL:
-            return klass;
+            break;
 
         case T_SYMBOL:
             id = (ID)SYM2ID(resource);
@@ -262,7 +251,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
             str = StringValueCStr(resource);
             if (*str == '\0')
             {
-                return klass;
+                break;
             }
             else if (rm_strcasecmp("area", str) == 0)
             {
@@ -297,6 +286,40 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
 
     RB_GC_GUARD(resource);
 
+    return res;
+}
+
+
+/**
+ * Get/set resource limits. If a limit is specified the old limit is set to the
+ * new value. Either way the current/old limit is returned.
+ *
+ * @overload limit_resource(resource)
+ *   Get resource limits.
+ *   @param resource [String, Symbol] the type of resource
+ *
+ * @overload limit_resource(resource, limit)
+ *   Set resource limits.
+ *   @param resource [String, Symbol] the type of resource
+ *   @param limit [Numeric] the new limit number
+ *
+ * @return [Numeric] the old limit.
+ */
+VALUE
+Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE resource, limit;
+    ResourceType res;
+    MagickSizeType cur_limit;
+
+    rb_scan_args(argc, argv, "11", &resource, &limit);
+
+    res = resource_type(resource);
+    if (res == UndefinedResource)
+    {
+        return klass;
+    }
+
     cur_limit = GetMagickResourceLimit(res);
 
     if (argc > 1)
@@ -310,6 +333,37 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
 }
 
 
+/**
+ * Get the amount of a resource that ImageMagick is using now. The memory, map
+ * and disk resources are in bytes. Most of them are the pixel caches of all
+ * images, including those of Image objects that are no longer referenced but
+ * have not been garbage collected yet. ImageMagick also counts blobs that it
+ * maps into memory and a few internal buffers, but not other memory it
+ * allocates.
+ *
+ * The area resource is the number of pixels of the last pixel cache that was
+ * checked against its limit, not a total.
+ *
+ * @param resource [String, Symbol] the type of resource
+ * @return [Numeric] the amount in use
+ * @see limit_resource
+ * @example
+ *   GC.start if Magick.resource_usage(:memory) > 1024**3
+ */
+VALUE
+Magick_resource_usage(VALUE klass ATTRIBUTE_UNUSED, VALUE resource)
+{
+    ResourceType res = resource_type(resource);
+
+    if (res == UndefinedResource)
+    {
+        rb_raise(rb_eArgError, "no resource given");
+    }
+
+    return ULL2NUM(GetMagickResource(res));
+}
+
+
 /**
  * Set the amount of free memory allocated for the pixel cache.  Once this
  * threshold is exceeded, all subsequent pixel cache operations are to/from

data/ext/RMagick/rmagick.h

@@ -555,6 +555,7 @@ extern VALUE Magick_colors(VALUE);
 extern VALUE Magick_fonts(VALUE);
 extern VALUE Magick_init_formats(VALUE);
 extern VALUE Magick_limit_resource(int, VALUE *, VALUE);
+extern VALUE Magick_resource_usage(VALUE, VALUE);
 extern VALUE Magick_set_cache_threshold(VALUE, VALUE);
 extern VALUE Magick_set_log_event_mask(int, VALUE *, VALUE);
 extern VALUE Magick_set_log_format(VALUE, VALUE);
@@ -587,10 +588,8 @@ ATTR_WRITER(Draw, tile)
 ATTR_WRITER(Draw, undercolor)
 extern VALUE Draw_alloc(VALUE);
 extern VALUE Draw_annotate(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
-extern VALUE Draw_clone(VALUE);
 extern VALUE Draw_composite(int, VALUE *, VALUE);
 extern VALUE Draw_draw(VALUE, VALUE);
-extern VALUE Draw_dup(VALUE);
 extern VALUE Draw_get_multiline_type_metrics(int, VALUE *, VALUE);
 extern VALUE Draw_get_type_metrics(int, VALUE *, VALUE);
 extern VALUE Draw_init_copy(VALUE, VALUE);
@@ -725,7 +724,7 @@ extern VALUE KernelInfo_initialize(VALUE, VALUE);
 extern VALUE KernelInfo_unity_add(VALUE, VALUE);
 extern VALUE KernelInfo_scale(VALUE, VALUE, VALUE);
 extern VALUE KernelInfo_scale_geometry(VALUE, VALUE);
-extern VALUE KernelInfo_clone(VALUE);
+extern VALUE KernelInfo_init_copy(VALUE, VALUE);
 
 extern VALUE KernelInfo_builtin(VALUE, VALUE, VALUE);
 
@@ -840,7 +839,6 @@ extern VALUE Image_channel_mean(int, VALUE *, VALUE);
 extern VALUE Image_channel_entropy(int, VALUE *, VALUE);
 extern VALUE Image_charcoal(int, VALUE *, VALUE);
 extern VALUE Image_chop(VALUE, VALUE, VALUE, VALUE, VALUE);
-extern VALUE Image_clone(VALUE);
 extern VALUE Image_clut_channel(int, VALUE *, VALUE);
 extern VALUE Image_color_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_color_histogram(VALUE);
@@ -882,7 +880,6 @@ extern VALUE Image_dissolve(int, VALUE *, VALUE);
 extern VALUE Image_distort(int, VALUE *, VALUE);
 extern VALUE Image_distortion_channel(int, VALUE *, VALUE);
 extern VALUE Image__dump(VALUE, VALUE);
-extern VALUE Image_dup(VALUE);
 extern VALUE Image_each_profile(VALUE);
 extern VALUE Image_edge(int, VALUE *, VALUE);
 extern VALUE Image_emboss(int, VALUE *, VALUE);
@@ -1053,8 +1050,6 @@ ATTR_ACCESSOR(Pixel, yellow)
 ATTR_ACCESSOR(Pixel, black)
 extern VALUE  Pixel_alloc(VALUE);
 extern VALUE  Pixel_case_eq(VALUE, VALUE);
-extern VALUE  Pixel_clone(VALUE);
-extern VALUE  Pixel_dup(VALUE);
 extern VALUE  Pixel_eql_q(VALUE, VALUE);
 extern VALUE  Pixel_fcmp(int, VALUE *, VALUE);
 extern VALUE  Pixel_from_color(VALUE, VALUE);

data/ext/RMagick/rmdraw.cpp

@@ -1010,26 +1010,6 @@ VALUE Draw_annotate(
 }
 
 
-/**
- * Clones this object.
- *
- * @return [Magick::Draw] the cloned object
- */
-VALUE
-Draw_clone(VALUE self)
-{
-    VALUE clone;
-
-    clone = Draw_dup(self);
-    if (OBJ_FROZEN(self))
-    {
-        OBJ_FREEZE(clone);
-    }
-
-    RB_GC_GUARD(clone);
-
-    return clone;
-}
 
 
 /**
@@ -1172,26 +1152,6 @@ Draw_draw(VALUE self, VALUE image_arg)
 }
 
 
-/**
- * Duplicate a Draw object.
- *
- * - Constructs a new Draw object, then calls initialize_copy.
- *
- * @return [Magick::Draw] the duplicated object
- */
-VALUE
-Draw_dup(VALUE self)
-{
-    Draw *draw;
-    VALUE dup;
-
-    draw = ALLOC(Draw);
-    memset(draw, 0, sizeof(Draw));
-    dup = TypedData_Wrap_Struct(CLASS_OF(self), &rm_draw_data_type, draw);
-    RB_GC_GUARD(dup);
-
-    return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
-}
 
 
 /**

data/ext/RMagick/rmimage.cpp

@@ -2714,27 +2714,6 @@ Image_chromaticity_eq(VALUE self, VALUE chroma)
 }
 
 
-/**
- * Same as {Magick::Image#dup} except the frozen state of the original is propagated to the new
- * copy.
- *
- * @return [Magick::Image] a clone of this object
- */
-VALUE
-Image_clone(VALUE self)
-{
-    VALUE clone;
-
-    clone = Image_dup(self);
-    if (OBJ_FROZEN(self))
-    {
-        OBJ_FREEZE(clone);
-    }
-
-    RB_GC_GUARD(clone);
-
-    return clone;
-}
 
 
 /**
@@ -3897,7 +3876,8 @@ composite_channel(int bang, int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Composite the source over the destination image channel as dictated by the affine transform.
+ * Composite the source over the destination image, changing only the specified channels of the
+ * destination. The arguments before the channels are the same as those of {Image#composite}.
  *
  * @overload composite_channel(image, x_off, y_off, composite_op, channel = Magick::AllChannels)
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
@@ -3970,8 +3950,8 @@ Image_composite_channel(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Composite the source over the destination image channel as dictated by the affine transform.
- * In-place form of {Image#composite_channel}.
+ * Composite the source over the destination image, changing only the specified channels of the
+ * destination. In-place form of {Image#composite_channel}.
  *
  * @overload composite_channel!(image, x_off, y_off, composite_op, channel = Magick::AllChannels)
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
@@ -4033,7 +4013,7 @@ Image_composite_channel(int argc, VALUE *argv, VALUE self)
  *   @param composite_op [Magick::CompositeOperator] the composite operator
  *   @param *channels [Magick::ChannelType] one or more ChannelType arguments.
  *
- * @return [Magick::Image] a new image
+ * @return [Magick::Image] self
  * @see Image#composite_channel
  * @see Image#composite!
  */
@@ -6222,22 +6202,6 @@ Image__dump(VALUE self, VALUE depth ATTRIBUTE_UNUSED)
 }
 
 
-/**
- * Duplicates an image.
- *
- * @return [Magick::Image] a new image
- */
-VALUE
-Image_dup(VALUE self)
-{
-    VALUE dup;
-
-    rm_check_destroyed(self);
-    dup = TypedData_Wrap_Struct(CLASS_OF(self), &rm_image_data_type, NULL);
-    RB_GC_GUARD(dup);
-
-    return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
-}
 
 
 /**
@@ -8697,11 +8661,12 @@ Image_level2(int argc, VALUE *argv, VALUE self)
 /**
  * Similar to {Image#level2} but applies to a single channel only.
  *
- * @overload level_channel(aChannelType, black = 0.0, white = 1.0, gamma = Magick::QuantumRange)
+ * @overload level_channel(aChannelType, black = 0.0, white = Magick::QuantumRange - black, gamma = 1.0)
  *   @param aChannelType [Magick::ChannelType] A ChannelType value.
  *   @param black [Numeric] A black point level in the range 0..QuantumRange.
  *   @param white [Numeric] A white point level in the range 0..QuantumRange.
- *   @param gamma [Numeric] A gamma correction in the range 0.0 - 10.0.
+ *   @param gamma [Numeric] A gamma correction. Unlike with {Image#level}, a value greater than 10.0 is
+ *     used as given.
  *   @return [Magick::Image] a new image
  *   @see Image#level2
  */
@@ -12065,35 +12030,71 @@ Image_rendering_intent_eq(VALUE self, VALUE ri)
 
 #if defined(IMAGEMAGICK_7)
 /**
- * Create new blurred image.
+ * Return the image to resize or resample with the given blur factor.
+ *
+ * ImageMagick 7 dropped the blur argument of ResizeImage() and ResampleImage(). Their filter
+ * reads the factor from the "filter:blur" artifact instead, as ImageMagick 6 did on top of the
+ * argument, so the factor is set there, multiplied by any "filter:blur" the image already has.
+ * A factor of 1.0 leaves the filter as it is.
  *
  * No Ruby usage (internal function)
  *
  * @param image the image
- * @param blur the blur
- * @return NULL if not apply blur, otherwise a new image
+ * @param blur the blur factor: > 1.0 blurs and < 1.0 sharpens
+ * @return the image itself when blur is 1.0, otherwise a clone that shares its pixels and has
+ *   the artifact set, which the caller destroys
  */
 static Image*
-blurred_image(Image* image, double blur)
+image_with_filter_blur(Image* image, double blur)
 {
-    ExceptionInfo *exception;
-    Image *new_image;
+    Image *clone;
+    const char *artifact;
+    char value[MaxTextExtent];
 
-    exception = AcquireExceptionInfo();
-    if (blur > 1.0)
+    if (blur == 1.0)
     {
-        GVL_STRUCT_TYPE(BlurImage) args = { image, blur, blur, exception };
-        new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlurImage), &args);
+        return image;
     }
-    else
+
+    artifact = GetImageArtifact(image, "filter:blur");
+    if (artifact)
     {
-        GVL_STRUCT_TYPE(SharpenImage) args = { image, blur, blur, exception };
-        new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SharpenImage), &args);
+        blur *= InterpretLocaleValue(artifact, (char **)NULL);
     }
-    rm_check_exception(exception, new_image, DestroyOnError);
-    DestroyExceptionInfo(exception);
+    snprintf(value, sizeof(value), "%.17g", blur);
 
-    return new_image;
+    clone = rm_clone_image(image);
+    if (!SetImageArtifact(clone, "filter:blur", value))
+    {
+        DestroyImage(clone);
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
+    return clone;
+}
+
+
+/**
+ * Give the result of a resize or resample the "filter:blur" artifact of the original image, or
+ * none, instead of the one image_with_filter_blur() set on the image it was made from.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param result the result image
+ * @param image the original image
+ */
+static void
+restore_filter_blur(Image* result, Image* image)
+{
+    const char *artifact = GetImageArtifact(image, "filter:blur");
+
+    if (artifact)
+    {
+        (void) SetImageArtifact(result, "filter:blur", artifact);
+    }
+    else
+    {
+        (void) DeleteImageArtifact(result, "filter:blur");
+    }
 }
 #endif
 
@@ -12178,12 +12179,22 @@ resample(int bang, int argc, VALUE *argv, VALUE self)
             break;
     }
 
+#if defined(IMAGEMAGICK_7)
+    // Before AcquireExceptionInfo(), since it can raise
+    Image *source = image_with_filter_blur(image, blur);
+#endif
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
-    Image *preprocess = blurred_image(image, blur);
-    GVL_STRUCT_TYPE(ResampleImage) args = { preprocess, x_resolution, y_resolution, filter, exception };
+    GVL_STRUCT_TYPE(ResampleImage) args = { source, x_resolution, y_resolution, filter, exception };
     new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ResampleImage), &args);
-    DestroyImage(preprocess);
+    if (source != image)
+    {
+        if (new_image)
+        {
+            restore_filter_blur(new_image, image);
+        }
+        DestroyImage(source);
+    }
 #else
     GVL_STRUCT_TYPE(ResampleImage) args = { image, x_resolution, y_resolution, filter, blur, exception };
     new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ResampleImage), &args);
@@ -12213,12 +12224,12 @@ resample(int bang, int argc, VALUE *argv, VALUE self)
  * the original resolution of the image must be specified via the density attribute prior to
  * specifying the resample resolution.
  *
- * @overload resample(x_resolution = 72.0, y_resolution = 72.0, filter = self.filter, blur = self.blur)
+ * @overload resample(x_resolution = 72.0, y_resolution = x_resolution, filter = self.filter, blur = 1.0)
  *   @param x_resolution [Numeric] the target horizontal resolution.
  *   @param y_resolution [Numeric] the target vertical resolution.
  *   @param filter [Magick::FilterType] the filter type
- *   @param blur [Numeric] the blur size
- *   @return [Magick] a new image
+ *   @param blur [Numeric] the blur factor of the filter: > 1.0 blurs and < 1.0 sharpens
+ *   @return [Magick::Image] a new image
  *   @see Image#resample!
  */
 VALUE
@@ -12233,12 +12244,12 @@ Image_resample(int argc, VALUE *argv, VALUE self)
  * Resample image to specified horizontal resolution, vertical resolution, filter and blur factor.
  * In-place form of {Image#resample}.
  *
- * @overload resample!(x_resolution = 72.0, y_resolution = 72.0, filter = self.filter, blur = self.blur)
+ * @overload resample!(x_resolution = 72.0, y_resolution = x_resolution, filter = self.filter, blur = 1.0)
  *   @param x_resolution [Numeric] the target horizontal resolution.
  *   @param y_resolution [Numeric] the target vertical resolution.
  *   @param filter [Magick::FilterType] the filter type
- *   @param blur [Numeric] the blur size
- *   @return [Magick] a new image
+ *   @param blur [Numeric] the blur factor of the filter: > 1.0 blurs and < 1.0 sharpens
+ *   @return [Magick::Image] self
  *   @see Image#resample
  */
 VALUE
@@ -12319,14 +12330,21 @@ resize(int bang, int argc, VALUE *argv, VALUE self)
             break;
     }
 
+#if defined(IMAGEMAGICK_7)
+    // Before AcquireExceptionInfo(), since it can raise
+    Image *source = image_with_filter_blur(image, blur);
+#endif
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
-    Image *preprocess = (argc == 4) ? blurred_image(image, blur) : image;
-    GVL_STRUCT_TYPE(ResizeImage) args = { preprocess, columns, rows, filter, exception };
+    GVL_STRUCT_TYPE(ResizeImage) args = { source, columns, rows, filter, exception };
     new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ResizeImage), &args);
-    if (argc == 4)
+    if (source != image)
     {
-        DestroyImage(preprocess);
+        if (new_image)
+        {
+            restore_filter_blur(new_image, image);
+        }
+        DestroyImage(source);
     }
 #else
     GVL_STRUCT_TYPE(ResizeImage) args = { image, columns, rows, filter, blur, exception };
@@ -12359,7 +12377,7 @@ resize(int bang, int argc, VALUE *argv, VALUE self)
  *   @param cols [Numeric] The desired width
  *   @param rows [Numeric] The desired height.
  *   @param filter [Magick::FilterType] the filter type
- *   @param blur [Numeric] the blur size
+ *   @param blur [Numeric] the blur factor of the filter: > 1.0 blurs and < 1.0 sharpens
  *
  * @return [Magick::Image] a new image
  * @see Image#resize!
@@ -12385,7 +12403,7 @@ Image_resize(int argc, VALUE *argv, VALUE self)
  *   @param cols [Numeric] The desired width
  *   @param rows [Numeric] The desired height.
  *   @param filter [Magick::FilterType] the filter type
- *   @param blur [Numeric] the blur size
+ *   @param blur [Numeric] the blur factor of the filter: > 1.0 blurs and < 1.0 sharpens
  *
  * @return [Magick::Image] a new image
  * @see Image#resize!
@@ -14603,8 +14621,8 @@ Image_ticks_per_second_eq(VALUE self, VALUE tps)
  *   @param red_alpha [Numeric] the red value
  *   @param green_alpha [Numeric] the green value
  *   @param blue_alpha [Numeric] the blue value
- *   @param alpha_alpha [Numeric] the alpha value
- *   @return a new image
+ *   @param alpha_alpha [Numeric] accepted but ignored: TintImage leaves the alpha channel unchanged
+ *   @return [Magick::Image] a new image
  */
 VALUE
 Image_tint(int argc, VALUE *argv, VALUE self)
@@ -15255,7 +15273,8 @@ VALUE Image_image_type_eq(VALUE self, VALUE image_type)
 
 
 /**
- * Removes an artifact from the image and returns its value.
+ * Removes an artifact from the image. The same as {Image#define} with a nil value, except that it
+ * returns self and that the name must be a String.
  *
  * @param artifact [String] the artifact
  * @return [Magick::Image] self