rmagick 7.1.4 → 7.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c3f56f5b39c2f505f37875134e7af86904393036c531e6074f2796939f204c
-  data.tar.gz: 3bf4833ad9aa56f93e1d2426bd6c72b95c54e0c2c8dcd2c4248f62635bf7606e
+  metadata.gz: e308c3194e4a4a558c205843e22e8aa4a00435d18945b7d978e9c2a8a0d513c0
+  data.tar.gz: e1d208d02935f3fd02cd20cf7331806820b42729898e9a6117ec1fd19fb625e8
 SHA512:
-  metadata.gz: ff12f7c040309d906c8ba517cc4a10c472019c0b99d718f470f24b804021dd2a431b4fd876a59e0c18eb8acbb8edac0eb2e15b68826a8ba11779e62e5894a202
-  data.tar.gz: 06dfb967d7de90cdc6791dcbb2e9fc6b5ece9ccef12e53b3588ea96c09960e28cd938b9f982654ccd95c6f765cd65a1fae179e3c230d14f4548511d851f36de8
+  metadata.gz: 8e9921e35f07f25cf2341dfac5d386362be9991ba52fc587a4556692d1fd32f86d02138a2338919a753a90c49450a18af708cb937058ae4db47580528882482d
+  data.tar.gz: 2577bf2c6006d4322c0c5a304ea0fcc7b34c1bafcbcba16194d75417acc863c2cdb2ef0140230b7e756c948016477e1ca1c7c96c33fc94d45b76066785f965e0

data/CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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]
+> More strings that ImageMagick would read from a file now raise `ArgumentError`.
+>
+> `Montage#title=` and the `caption`, `comment` and `label` options, set through `Info#caption=`, `#comment=`, `#label=` or `Info#[]=`, now reject a value whose first non-blank character is `@`, as `Image#polaroid` has done since 7.1.4. ImageMagick read the file it named and put its contents into the montage or into the metadata of the image being read. These checks and the one in `Image#polaroid` also reject a `%[fx:@...]`, `%[hex:@...]` or `%[pixel:@...]` escape, which ImageMagick 7 reads from the named file as well, and their message now says the value "must not name a file with '@'".
+>
+> `Image#profile!` now accepts only the profile formats of ImageMagick's META coder (8BIM, APP1, EXIF, ICC, ICM, IPTC, XMP and their variants) and raises `ArgumentError` for any other name. It decoded the profile with the coder of whatever name it was given, so a profile named `msl` copied from an uploaded image ran as an MSL script.
+
+Breaking Changes
+
+* Accept only META profile formats in Image#profile! instead of decoding the profile with the coder of that name (#1873)
+* Reject a Montage#title beginning with '@' instead of reading that file (#1874)
+* Reject an Info#caption, #comment or #label value beginning with '@' instead of reading that file (#1875)
+* Also reject %[fx:@...], %[hex:@...] and %[pixel:@...] escapes where a value beginning with '@' is rejected (#1876)
+
+Bug Fixes
+
+* Fix stack buffer overflow in Image#inspect with a long format name (#1877)
+
 ## RMagick 7.1.4
 
 > [!IMPORTANT]

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);
@@ -1159,6 +1154,7 @@ extern VALUE  rm_no_freeze(VALUE) ATTRIBUTE_NORETURN;
 extern int    rm_strcasecmp(const char *, const char *);
 extern int    rm_strncasecmp(const char *, const char *, size_t);
 extern size_t rm_strnlen_s(const char *, size_t);
+extern bool   rm_has_file_reference(const char *);
 extern void   rm_check_ary_len(VALUE, long);
 extern VALUE  rm_check_ary_type(VALUE ary);
 extern Image *rm_check_destroyed(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);
-}
 
 
 /**