rmagick 7.0.4 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b67e7280c692114f508e96e6ddcf8d554825ba3705e917af4484158aba940f
-  data.tar.gz: 2ec01a3108eda0eebe35603ae94f675b0966343d5ccb8b2461706b67ea4f3e2c
+  metadata.gz: c56286daf220fd8db82fce268ce2116705e192b643641cc88b4d7e53b6a46d1a
+  data.tar.gz: 1a060762de65e6bf6a384a7f10c3036f85d6876ec89c1be54fede6ea4f20e604
 SHA512:
-  metadata.gz: 1494b9956d04b5f569a39df7e436cae2cc361b093d8fc4339e7b6f56f893e0782f0e506d24faf807d8cc88c7fff697894b39f29cf651666ff1398d8bf421ed4a
-  data.tar.gz: 06e999110504c4ab2fc1c0ddbd9e43b7415c70173780e127d25132ad0d1e5f172622a445f61922800994ef6aed543f141d984602430f0db8ce0b48fafb2974b0
+  metadata.gz: c7ebbec352d94fdeb8873353c8c13a8d3432b2f89c26c05a8520ee56353c1daedde3717429ad6ec1b9c66a9d9ca71eb51c498833ea0e7419fb572f38642d4fcd
+  data.tar.gz: c7a7941f288dd513f5ab88d009011c07575fc07e95c772fd3950db9d8828738c7ab49e6fa3484a4ead018ecbe0a002b260f4e0c670c70647aac11419465f09a5

data/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.1.0
+
+> [!IMPORTANT]
+> `Draw#annotate` and `Draw#get_type_metrics` no longer interpret the text they are given.
+> A `%[...]` or `%x` escape in it is now drawn as written instead of being replaced by an image property.
+> Everything those escapes provided is available directly from Ruby -- `Image#columns`, `Image#rows`, `Image#format`, `Image#filesize`, `Image#filename`, `Image#[]`, `Image#artifact`, `Image#channel_mean`, `Image#pixel_color` and `Image#fx` -- so build the string in Ruby and pass the result.
+>
+> The interpolation was undocumented, and it handed any caller that passed user-supplied text an expression evaluator, a pixel and metadata reader, and an unbounded CPU sink. It also corrupted ordinary captions: `"%d items"` was drawn as the directory the image had been read from.
+
+Breaking Changes
+
+* Draw annotation text as given instead of interpreting it (#1843)
+* Draw text starting with '@' instead of reading it from that file (#1837)
+* Validate RVG path data against the SVG path grammar (#1839)
+* Escape values and quote the clip-path and encoding names in the MVG program (#1841)
+* Reject embedded NUL bytes in pathname arguments (#1827)
+
+Improvements
+
+* Add Image#artifact to read the artifacts Image#define writes (#1842)
+* Fix grammar, typos, and content errors in the documentation (#1824)
+
+Bug Fixes
+
+* Fix RVG text being quoted twice and the added quotes being drawn (#1840)
+* Fix MVG injection in Draw#text from unescaped backslashes (#1838)
+* Fix memory leak in ImageList#composite_layers with an unusable source list (#1836)
+* Fix heap over-read in Image#import_pixels with a long or empty map (#1835)
+* Fix SEGV from integer overflow in Image#import_pixels geometry (#1834)
+* Fix heap over-read in Image#recolor (#1833)
+* Fix SEGV in Draw#marshal_load with a non-String pattern (#1832)
+* Fix use-after-free of cloned images in images_from_imagelist() (#1831)
+* Fix double free of the interpreted text in Draw#get_type_metrics (#1830)
+* Fix double free of the annotation text in Draw#annotate (#1829)
+* Fix SEGV in Info#stroke_width= and Info#attenuate= with a large Float (#1828)
+* Fix Magick#set_log_event_mask() (#1826)
+* Fix copy_options() using the option value as the artifact key (#1823)
+* Fix unchecked SetImageArtifact() calls (#1822)
+
+## RMagick 7.0.5
+
+Bug Fixes
+
+* Fix heap overflow from integer overflow in dispatch/export_pixels geometry (#1816)
+* Fix SEGV in Image/Pixel/Draw #marshal_load on a non-collection argument (#1815)
+* Fix SEGV when a Draw method is called on an uninitialized object (#1814)
+* Fix SEGV in Draw#primitive on non-String argument (#1813)
+
 ## RMagick 7.0.4
 
 Bug Fixes

data/Rakefile

@@ -188,6 +188,12 @@ end
 if RUBY_PLATFORM.include?('linux')
   require 'ruby_memcheck'
   require 'ruby_memcheck/rspec/rake_task'
+
+  RubyMemcheck.config(
+    binary_name: 'RMagick2',
+    valgrind_suppressions_dir: 'spec/valgrind'
+  )
+
   namespace :spec do
     RubyMemcheck::RSpec::RakeTask.new(valgrind: :compile)
   end

data/ext/RMagick/extconf.rb

@@ -123,7 +123,7 @@ module RMagick
         $LDFLAGS    += " #{ldflags} #{rpath}"
 
         unless try_link("int main() { }")
-          # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
+          # if linker does not recognize '-Wl,-rpath,somewhere' option, it reverts to original option
           $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
       end
@@ -344,7 +344,7 @@ module RMagick
     end
 
     def print_summary
-      summary = <<~"END_SUMMARY"
+      summary = <<~END_SUMMARY
         #{'=' * 70}
         #{Time.now.strftime('%a %d %b %y %T')}
         This installation of RMagick #{RMAGICK_VERS} is configured for

data/ext/RMagick/rmagick.cpp

@@ -312,7 +312,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
 
 /**
  * Set the amount of free memory allocated for the pixel cache.  Once this
- * threshold is exceeded, all subsequent pixels cache operations are to/from
+ * threshold is exceeded, all subsequent pixel cache operations are to/from
  * disk.
  *
  * @param threshold [Numeric] the number of megabytes to set.
@@ -346,23 +346,45 @@ Magick_set_cache_threshold(VALUE klass, VALUE threshold)
  * - "user"
  * - "x11"
  *
- * Multiple events can be specified as the aruments. Event names may be capitalized.
+ * Multiple events can be specified as the arguments. Event names may be capitalized.
  *
- * @param args [String] the mask of log event.
+ * @param args [Array<String>] one or more log event types (comma-separated lists and/or multiple arguments).
+ * @raise [ArgumentError] if an event name is invalid
  */
 VALUE
 Magick_set_log_event_mask(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE events;
     int x;
 
     if (argc == 0)
     {
         rb_raise(rb_eArgError, "wrong number of arguments (at least 1 required)");
     }
+
+    // SetLogEventMask() does not provide a way to check if it failed
+    // since it returns the old mask.
     for (x = 0; x < argc; x++)
     {
-        SetLogEventMask(StringValueCStr(argv[x]));
+        const char *event = StringValueCStr(argv[x]);
+        if (ParseCommandOption(MagickLogEventOptions, MagickTrue, event) == -1)
+        {
+            rb_raise(rb_eArgError, "invalid log event type: %s", event);
+        }
+    }
+
+    // SetLogEventMask() replaces the mask on each call rather than adding to it,
+    // so multiple events must be passed as a single comma-separated list.
+    events = rb_str_dup(argv[0]);
+    for (x = 1; x < argc; x++)
+    {
+        rb_str_cat_cstr(events, ",");
+        rb_str_append(events, argv[x]);
     }
+    SetLogEventMask(StringValueCStr(events));
+
+    RB_GC_GUARD(events);
+
     return klass;
 }
 

data/ext/RMagick/rmagick.h

@@ -108,10 +108,10 @@ extern "C" {
 #define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quantum <- Ruby Numeric conversion */
 #elif (MAGICKCORE_QUANTUM_DEPTH == 32)
 #define QUANTUM2NUM(q) UINT2NUM((q)) /**< Quantum -> Ruby Numeric conversion */
-#define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quntum <- Ruby Numeric conversion */
+#define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quantum <- Ruby Numeric conversion */
 #elif (MAGICKCORE_QUANTUM_DEPTH == 64)
 #define QUANTUM2NUM(q) ULL2NUM((q)) /**< Quantum -> Ruby Numeric conversion */
-#define NUM2QUANTUM(n) (Quantum)NUM2ULL((n)) /**< Quntum <- Ruby Numeric conversion */
+#define NUM2QUANTUM(n) (Quantum)NUM2ULL((n)) /**< Quantum <- Ruby Numeric conversion */
 #else
 #error Specified MAGICKCORE_QUANTUM_DEPTH is not supported.
 #endif
@@ -247,7 +247,7 @@ typedef enum {
 //! Draw#text_anchor AnchorType argument
 typedef enum {
     StartAnchor = 1,  /**< start */
-    MiddleAnchor = 2, /**< midle */
+    MiddleAnchor = 2, /**< middle */
     EndAnchor = 3     /**< end */
 } AnchorType;
 
@@ -813,6 +813,7 @@ extern VALUE Image_affine_transform(VALUE, VALUE);
 extern VALUE Image_alpha(int, VALUE *, VALUE);
 extern VALUE Image_alpha_q(VALUE);
 extern VALUE Image_aref(VALUE, VALUE);
+extern VALUE Image_artifact(VALUE, VALUE);
 extern VALUE Image_aset(VALUE, VALUE, VALUE);
 extern VALUE Image_auto_gamma_channel(int, VALUE *, VALUE);
 extern VALUE Image_auto_level_channel(int, VALUE *, VALUE);
@@ -1163,6 +1164,7 @@ extern VALUE  rm_check_ary_type(VALUE ary);
 extern Image *rm_check_destroyed(VALUE);
 extern Image *rm_check_frozen(VALUE);
 extern char  *rm_str2cstr(VALUE, size_t *);
+extern char  *rm_path2cstr(VALUE, size_t *);
 extern int    rm_check_num2dbl(VALUE);
 extern double rm_fuzz_to_dbl(VALUE);
 extern Quantum rm_app2quantum(VALUE);

data/ext/RMagick/rmdraw.cpp

@@ -47,6 +47,33 @@ DEFINE_GVL_STUB3(GetTypeMetrics, Image *, const DrawInfo *, TypeMetric *);
 #endif
 
 
+/**
+ * Fetch the Draw struct and ensure it has been initialized (draw->info != NULL).
+ *
+ * Draw_alloc() leaves draw->info NULL until #initialize runs, so a Draw obtained
+ * via .allocate (or a subclass whose #initialize skips super) would otherwise
+ * dereference a NULL DrawInfo and crash the process. Raise instead.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param self the Draw object
+ * @return the initialized Draw struct
+ * @throw RuntimeError if the Draw object has not been initialized
+ */
+static Draw *
+get_draw(VALUE self)
+{
+    Draw *draw;
+
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    if (!draw->info)
+    {
+        rb_raise(rb_eRuntimeError, "%s has not been initialized", rb_obj_classname(self));
+    }
+    return draw;
+}
+
+
 /**
  * Set the affine matrix from an {Magick::AffineMatrix}.
  *
@@ -59,7 +86,7 @@ Draw_affine_eq(VALUE self, VALUE matrix)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     Export_AffineMatrix(&draw->info->affine, matrix);
     return matrix;
 }
@@ -77,7 +104,7 @@ Draw_align_eq(VALUE self, VALUE align)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     VALUE_TO_ENUM(align, draw->info->align, AlignType);
     return align;
 }
@@ -95,7 +122,7 @@ Draw_decorate_eq(VALUE self, VALUE decorate)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     VALUE_TO_ENUM(decorate, draw->info->decorate, DecorationType);
     return decorate;
 }
@@ -113,7 +140,7 @@ Draw_density_eq(VALUE self, VALUE density)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     magick_clone_string(&draw->info->density, StringValueCStr(density));
 
     return density;
@@ -132,7 +159,7 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     magick_clone_string(&draw->info->encoding, StringValueCStr(encoding));
 
     return encoding;
@@ -151,7 +178,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     Color_to_PixelColor(&draw->info->fill, fill);
     return fill;
 }
@@ -172,7 +199,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
 
     if (draw->info->fill_pattern != NULL)
     {
@@ -207,7 +234,7 @@ Draw_font_eq(VALUE self, VALUE font)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     magick_clone_string(&draw->info->font, StringValueCStr(font));
 
     return font;
@@ -226,7 +253,7 @@ Draw_font_family_eq(VALUE self, VALUE family)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     magick_clone_string(&draw->info->family, StringValueCStr(family));
 
     return family;
@@ -245,7 +272,7 @@ Draw_font_stretch_eq(VALUE self, VALUE stretch)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     VALUE_TO_ENUM(stretch, draw->info->stretch, StretchType);
     return stretch;
 }
@@ -263,7 +290,7 @@ Draw_font_style_eq(VALUE self, VALUE style)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     VALUE_TO_ENUM(style, draw->info->style, StyleType);
     return style;
 }
@@ -283,7 +310,7 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
     size_t w;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
 
     if (FIXNUM_P(weight))
     {
@@ -349,7 +376,7 @@ Draw_gravity_eq(VALUE self, VALUE grav)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     VALUE_TO_ENUM(grav, draw->info->gravity, GravityType);
 
     return grav;
@@ -368,7 +395,7 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     draw->info->kerning = NUM2DBL(kerning);
     return kerning;
 }
@@ -386,7 +413,7 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     draw->info->interline_spacing = NUM2DBL(spacing);
     return spacing;
 }
@@ -404,7 +431,7 @@ Draw_interword_spacing_eq(VALUE self, VALUE spacing)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     draw->info->interword_spacing = NUM2DBL(spacing);
     return spacing;
 }
@@ -473,6 +500,8 @@ Image *str_to_image(VALUE str)
         Info *info;
         ExceptionInfo *exception;
 
+        StringValue(str);
+
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
         GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(str), (size_t)RSTRING_LEN(str), exception };
@@ -505,7 +534,7 @@ Draw_marshal_dump(VALUE self)
     Draw *draw;
     VALUE ddraw;
 
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
 
     // Raise an exception if the Draw has a non-NULL gradient or element_reference field
     if (draw->info->element_reference.type != UndefinedReference
@@ -566,6 +595,8 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
 
     TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
+    Check_Type(ddraw, T_HASH);
+
     if (draw->info == NULL)
     {
         ImageInfo *image_info;
@@ -636,7 +667,7 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     draw->info->pointsize = NUM2DBL(pointsize);
     return pointsize;
 }
@@ -656,7 +687,7 @@ Draw_rotation_eq(VALUE self, VALUE deg)
     AffineMatrix affine, current;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
 
     degrees = NUM2DBL(deg);
     if (fabs(degrees) > DBL_EPSILON)
@@ -692,7 +723,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     Color_to_PixelColor(&draw->info->stroke, stroke);
     return stroke;
 }
@@ -712,7 +743,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
 
     if (draw->info->stroke_pattern != NULL)
     {
@@ -748,7 +779,7 @@ Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     draw->info->stroke_width = NUM2DBL(stroke_width);
     return stroke_width;
 }
@@ -766,7 +797,7 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     draw->info->text_antialias = (MagickBooleanType) RTEST(text_antialias);
     return text_antialias;
 }
@@ -797,7 +828,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     Color_to_PixelColor(&draw->info->undercolor, undercolor);
     return undercolor;
 }
@@ -807,7 +838,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
  * Annotates an image with text.
  *
  * - Additional Draw attribute methods may be called in the optional block,
- *   which is executed in the context of an Draw object.
+ *   which is executed in the context of a Draw object.
  *
  * @param image_arg [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *   imagelist, uses the current image.
@@ -840,7 +871,7 @@ VALUE Draw_annotate(
 
     // Save the affine matrix in case it is modified by
     // Draw#rotation=
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     keep = draw->info->affine;
 
     image_arg = rm_cur_image(image_arg);
@@ -853,29 +884,15 @@ VALUE Draw_annotate(
         rb_yield(self);
     }
 
-    // Translate & store in Draw structure
+    // Store in Draw structure. The text is drawn as given: it is not run
+    // through InterpretImageProperties(), so a `%[...]` or `%x` escape in it is
+    // not expanded. Everything those escapes provide is available directly from
+    // Ruby -- Image#columns, Image#filename, Image#artifact and so on.
     embed_text = StringValueCStr(text);
+    draw->info->text = ConstantString(embed_text);
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    draw->info->text = InterpretImageProperties(NULL, image, embed_text, exception);
-    if (rm_should_raise_exception(exception, RetainExceptionRetention))
-    {
-        if (draw->info->text)
-        {
-            magick_free(draw->info->text);
-        }
-        rm_raise_exception(exception);
-    }
-#else
-    draw->info->text = InterpretImageProperties(NULL, image, embed_text);
 #endif
-    if (!draw->info->text)
-    {
-#if defined(IMAGEMAGICK_7)
-        DestroyExceptionInfo(exception);
-#endif
-        rb_raise(rb_eArgError, "no text");
-    }
 
     // Create geometry string, copy to Draw structure, overriding
     // any previously existing value.
@@ -1050,7 +1067,7 @@ Draw_draw(VALUE self, VALUE image_arg)
     image_arg = rm_cur_image(image_arg);
     image = rm_check_frozen(image_arg);
 
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     if (draw->primitives == 0)
     {
         rb_raise(rb_eArgError, "nothing to draw");
@@ -1118,7 +1135,7 @@ Draw_dup(VALUE self)
  *     imagelist, uses the current image.
  *   @param text [String] The string to be rendered.
  *
- * @return [Magick::TypeMetric] The information for a specific string if rendered on a image.
+ * @return [Magick::TypeMetric] The information for a specific string if rendered on an image.
  */
 VALUE
 Draw_get_type_metrics(
@@ -1145,7 +1162,7 @@ Draw_get_type_metrics(
  *     imagelist, uses the current image.
  *   @param text [String] The string to be rendered.
  *
- * @return [Magick::TypeMetric] The information for a specific string if rendered on a image.
+ * @return [Magick::TypeMetric] The information for a specific string if rendered on an image.
  */
 VALUE
 Draw_get_multiline_type_metrics(
@@ -1257,6 +1274,7 @@ Draw_primitive(VALUE self, VALUE primitive)
     Draw *draw;
 
     rb_check_frozen(self);
+    StringValue(primitive);
     TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->primitives == (VALUE)0)
@@ -1310,7 +1328,7 @@ Draw_mark(void *drawptr)
 
 
 /**
- * Free the memory associated with an Draw object.
+ * Free the memory associated with a Draw object.
  *
  * No Ruby usage (internal function)
  *
@@ -1371,7 +1389,7 @@ new_DrawOptions(void)
 /**
  * Create a DrawOptions object.
  *
- * - The DrawOptions class is the same as the Draw class except is has only
+ * - The DrawOptions class is the same as the Draw class except it has only
  *   the attribute writer functions
  *
  * @return [Magick::Image::DrawOptions] a new DrawOptions object
@@ -1463,7 +1481,7 @@ PolaroidOptions_initialize(VALUE self)
     ExceptionInfo *exception;
 
     // Default shadow color
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
 
     exception = AcquireExceptionInfo();
     QueryColorCompliance("gray75", AllCompliance, &draw->shadow_color, exception);
@@ -1525,7 +1543,7 @@ PolaroidOptions_border_color_eq(VALUE self, VALUE border)
     Draw *draw;
 
     rb_check_frozen(self);
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    draw = get_draw(self);
     Color_to_PixelColor(&draw->info->border_color, border);
     return border;
 }
@@ -1628,30 +1646,12 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
         rb_raise(rb_eArgError, "no text to measure");
     }
 
-    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
-#if defined(IMAGEMAGICK_7)
-    exception = AcquireExceptionInfo();
-    draw->info->text = InterpretImageProperties(NULL, image, text, exception);
-    if (rm_should_raise_exception(exception, RetainExceptionRetention))
-    {
-        if (draw->info->text)
-        {
-            magick_free(draw->info->text);
-        }
-        rm_raise_exception(exception);
-    }
-#else
-    draw->info->text = InterpretImageProperties(NULL, image, text);
-#endif
-    if (!draw->info->text)
-    {
-#if defined(IMAGEMAGICK_7)
-        DestroyExceptionInfo(exception);
-#endif
-        rb_raise(rb_eArgError, "no text to measure");
-    }
+    draw = get_draw(self);
+    // Measured as given: see the comment in Draw_annotate().
+    draw->info->text = ConstantString(text);
 
 #if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics, exception };
 #else
     GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics };

data/ext/RMagick/rmenum.cpp

@@ -219,7 +219,7 @@ Enum_spaceship(VALUE self, VALUE other)
 /**
  * Bitwise OR for enums
  *
- * @param another [Magick::Enum] the another enum
+ * @param another [Magick::Enum] the other enum
  * @return [Magick::Enum] new Enum instance
  */
 VALUE
@@ -361,7 +361,7 @@ Enum_type_values(VALUE klass)
  *
  * @param klass the class type
  * @param value the value for enum
- * @return a enumerator
+ * @return an enumerator
  */
 
 VALUE
@@ -541,7 +541,7 @@ CompressionType_find(CompressionType ct)
 
 
 /**
- * Returns a DisposeType enum object for the specified value..new.
+ * Returns a DisposeType enum object for the specified value.
  *
  * No Ruby usage (internal function)
  *
@@ -661,7 +661,7 @@ PixelInterpolateMethod_find(PixelInterpolateMethod interpolate)
 
 
 /**
- * Construct an RenderingIntent enum object for the specified value.
+ * Construct a RenderingIntent enum object for the specified value.
  *
  * No Ruby usage (internal function)
  *
@@ -785,7 +785,7 @@ StyleType_find(StyleType style)
  *
  * No Ruby usage (internal function)
  *
- * @param style theVirtualPixelMethod
+ * @param style the VirtualPixelMethod
  * @return a new VirtualPixelMethod enumerator
  */
 VALUE