rmagick 4.0.0 → 5.3.0

data/ext/RMagick/rmdraw.c

@@ -13,24 +13,50 @@
 #include "rmagick.h"
 #include "float.h"
 
-static void mark_Draw(void *);
-static void destroy_Draw(void *);
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+static void Draw_compact(void *drawptr);
+#endif
+static void Draw_mark(void *);
+static void Draw_destroy(void *);
+static size_t Draw_memsize(const void *);
 static VALUE new_DrawOptions(void);
+static VALUE get_type_metrics(int, VALUE *, VALUE, gvl_function_t);
 
-/** Method that gets type metrics */
-typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *);
-static VALUE get_type_metrics(int, VALUE *, VALUE, get_type_metrics_func_t);
+const rb_data_type_t rm_draw_data_type = {
+    "Magick::Draw",
+    {
+        Draw_mark,
+        Draw_destroy,
+        Draw_memsize,
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+        Draw_compact,
+#endif
+    },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
+
+
+DEFINE_GVL_STUB4(BlobToImage, const ImageInfo *, const void *, const size_t, ExceptionInfo *);
+DEFINE_GVL_STUB4(ImageToBlob, const ImageInfo *, Image *, size_t *, ExceptionInfo *);
+#if defined(IMAGEMAGICK_7)
+DEFINE_GVL_STUB3(AnnotateImage, Image *, const DrawInfo *, ExceptionInfo *);
+DEFINE_GVL_STUB3(DrawImage, Image *, const DrawInfo *, ExceptionInfo *);
+DEFINE_GVL_STUB4(GetMultilineTypeMetrics, Image *, const DrawInfo *, TypeMetric *, ExceptionInfo *);
+DEFINE_GVL_STUB4(GetTypeMetrics, Image *, const DrawInfo *, TypeMetric *, ExceptionInfo *);
+#else
+DEFINE_GVL_STUB2(AnnotateImage, Image *, const DrawInfo *);
+DEFINE_GVL_STUB2(DrawImage, Image *, const DrawInfo *);
+DEFINE_GVL_STUB3(GetMultilineTypeMetrics, Image *, const DrawInfo *, TypeMetric *);
+DEFINE_GVL_STUB3(GetTypeMetrics, Image *, const DrawInfo *, TypeMetric *);
+#endif
 
 
 /**
- * Set the affine matrix from an Magick::AffineMatrix.
- *
- * Ruby usage:
- *   - @verbatim Draw#affine= @endverbatim
+ * Set the affine matrix from an {Magick::AffineMatrix}.
  *
- * @param self this object
- * @param matrix the affine matrix to set
- * @return matrix
+ * @param matrix [Magick::AffineMatrix] the affine matrix
+ * @return [Magick::AffineMatrix] the given matrix
  */
 VALUE
 Draw_affine_eq(VALUE self, VALUE matrix)
@@ -38,21 +64,17 @@ Draw_affine_eq(VALUE self, VALUE matrix)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Export_AffineMatrix(&draw->info->affine, matrix);
     return matrix;
 }
 
 
 /**
- * Set the text alignment.
+ * Set the text alignment from an {Magick::AlignType}.
  *
- * Ruby usage:
- *   - @verbatim Draw#align= @endverbatim
- *
- * @param self this object
- * @param align the alignment
- * @return align
+ * @param align [Magick::AlignType] the text alignment
+ * @return [Magick::AlignType] the given align
  */
 VALUE
 Draw_align_eq(VALUE self, VALUE align)
@@ -60,21 +82,17 @@ Draw_align_eq(VALUE self, VALUE align)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(align, draw->info->align, AlignType);
     return align;
 }
 
 
 /**
- * Decorate attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#decorate= @endverbatim
+ * Set text decorate from an {Magick::DecorationType}.
  *
- * @param self this object
- * @param decorate the decorate
- * @return decorate
+ * @param decorate [Magick::DecorationType] the decorate type
+ * @return [Magick::DecorationType] the given decorate
  */
 VALUE
 Draw_decorate_eq(VALUE self, VALUE decorate)
@@ -82,21 +100,17 @@ Draw_decorate_eq(VALUE self, VALUE decorate)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(decorate, draw->info->decorate, DecorationType);
     return decorate;
 }
 
 
 /**
- * Density attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#density= @endverbatim
+ * Set density.
  *
- * @param self this object
- * @param density the density
- * @return density
+ * @param density [String] the density
+ * @return [String] the given density
  */
 VALUE
 Draw_density_eq(VALUE self, VALUE density)
@@ -104,22 +118,18 @@ Draw_density_eq(VALUE self, VALUE density)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->density, StringValuePtr(density));
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    magick_clone_string(&draw->info->density, StringValueCStr(density));
 
     return density;
 }
 
 
 /**
- * Encoding attribute writer.
+ * Set text encoding.
  *
- * Ruby usage:
- *   - @verbatim Draw#encoding= @endverbatim
- *
- * @param self this object
- * @param encoding the encoding
- * @return encoding
+ * @param encoding [String] the encoding name
+ * @return [String] the given encoding name
  */
 VALUE
 Draw_encoding_eq(VALUE self, VALUE encoding)
@@ -127,22 +137,18 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->encoding, StringValuePtr(encoding));
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    magick_clone_string(&draw->info->encoding, StringValueCStr(encoding));
 
     return encoding;
 }
 
 
 /**
- * Fill attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#fill= @endverbatim
+ * Set fill color.
  *
- * @param self this object
- * @param fill the fill
- * @return fill
+ * @param fill [Magick::Pixel, String] the fill color
+ * @return [Magick::Pixel, String] the given fill color
  */
 VALUE
 Draw_fill_eq(VALUE self, VALUE fill)
@@ -150,7 +156,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->fill, fill);
     return fill;
 }
@@ -159,23 +165,19 @@ Draw_fill_eq(VALUE self, VALUE fill)
 /**
  * Accept an image as a fill pattern.
  *
- * Ruby usage:
- *   - @verbatim Draw#fill_pattern= @endverbatim
- *
- * @param self this object
- * @param pattern the fill pattern
- * @return pattern
- * @see Draw_stroke_pattern_eq
- * @see Draw_tile_eq
+ * @param pattern [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *   imagelist, uses the current image.
+ * @return [Magick::Image] the given pattern image
+ * @see #stroke_pattern=
+ * @see #tile=
  */
 VALUE
 Draw_fill_pattern_eq(VALUE self, VALUE pattern)
 {
     Draw *draw;
-    Image *image;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->info->fill_pattern != NULL)
     {
@@ -186,6 +188,8 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
 
     if (!NIL_P(pattern))
     {
+        Image *image;
+
         pattern = rm_cur_image(pattern);
         image = rm_check_destroyed(pattern);
         // Do not trace creation
@@ -197,14 +201,10 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
 
 
 /**
- * Font attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#font= @endverbatim
+ * Set the font name.
  *
- * @param self this object
- * @param font the font
- * @return font
+ * @param font [String] the font name
+ * @return [String] the given font name
  */
 VALUE
 Draw_font_eq(VALUE self, VALUE font)
@@ -212,22 +212,18 @@ Draw_font_eq(VALUE self, VALUE font)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->font, StringValuePtr(font));
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    magick_clone_string(&draw->info->font, StringValueCStr(font));
 
     return font;
 }
 
 
 /**
- * Font family attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#family= @endverbatim
+ * Set the font family name.
  *
- * @param self this object
- * @param family the family
- * @return family
+ * @param family [String] the font family name
+ * @return [String] the given family name
  */
 VALUE
 Draw_font_family_eq(VALUE self, VALUE family)
@@ -235,22 +231,18 @@ Draw_font_family_eq(VALUE self, VALUE family)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->family, StringValuePtr(family));
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
+    magick_clone_string(&draw->info->family, StringValueCStr(family));
 
     return family;
 }
 
 
 /**
- * Font_stretch attribute writer.
+ * Set the stretch as spacing between text characters.
  *
- * Ruby usage:
- *   - @verbatim Draw#font_stretch= @endverbatim
- *
- * @param self this object
- * @param stretch the font_stretch
- * @return stretch
+ * @param stretch [Magick::StretchType] the stretch type
+ * @return [Magick::StretchType] the given stretch type
  */
 VALUE
 Draw_font_stretch_eq(VALUE self, VALUE stretch)
@@ -258,21 +250,17 @@ Draw_font_stretch_eq(VALUE self, VALUE stretch)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(stretch, draw->info->stretch, StretchType);
     return stretch;
 }
 
 
 /**
- * Font_style attribute writer.
+ * Set font style.
  *
- * Ruby usage:
- *   - @verbatim Draw#font_style= @endverbatim
- *
- * @param self this object
- * @param style the font_style
- * @return style
+ * @param style [Magick::StyleType] the font style
+ * @return [Magick::StyleType] the given font style
  */
 VALUE
 Draw_font_style_eq(VALUE self, VALUE style)
@@ -280,25 +268,18 @@ Draw_font_style_eq(VALUE self, VALUE style)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(style, draw->info->style, StyleType);
     return style;
 }
 
 
 /**
- * Font_weight attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#font_weight= @endverbatim
+ * Set font weight.
  *
- * Notes:
- *   - The font weight can be one of the font weight constants or a number
- *     between 100 and 900
- *
- * @param self this object
- * @param weight the font_weight
- * @return weight
+ * @param weight [Magick::WeightType, Numeric] the font weight
+ * @return [Magick::WeightType, Numeric] the given font weight
+ * @note The font weight can be one of the font weight constants or a number between 100 and 900
  */
 VALUE
 Draw_font_weight_eq(VALUE self, VALUE weight)
@@ -307,14 +288,14 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
     size_t w;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (FIXNUM_P(weight))
     {
         w = FIX2INT(weight);
         if (w < 100 || w > 900)
         {
-            rb_raise(rb_eArgError, "invalid font weight (%ld given)", w);
+            rb_raise(rb_eArgError, "invalid font weight (%"RMIuSIZE" given)", w);
         }
         draw->info->weight = w;
     }
@@ -351,27 +332,21 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
 
 
 /**
- * Gravity attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#gravity= @endverbatim
- *
- * Notes:
- *   - From Magick++'s Image.h header file:
- *     Gravity affects text placement in bounding area according to rules:
- *     - NorthWestGravity  text bottom-left corner placed at top-left
- *     - NorthGravity      text bottom-center placed at top-center
- *     - NorthEastGravity  text bottom-right corner placed at top-right
- *     - WestGravity       text left-center placed at left-center
- *     - CenterGravity     text center placed at center
- *     - EastGravity       text right-center placed at right-center
- *     - SouthWestGravity  text top-left placed at bottom-left
- *     - SouthGravity      text top-center placed at bottom-center
- *     - SouthEastGravity  text top-right placed at bottom-right
- *
- * @param self this object
- * @param grav the gravity
- * @return grav
+ * Set gravity to draw text.
+ * Gravity affects text placement in bounding area according to rules:
+ *
+ * - +NorthWestGravity+  - text bottom-left corner placed at top-left
+ * - +NorthGravity+      - text bottom-center placed at top-center
+ * - +NorthEastGravity+  - text bottom-right corner placed at top-right
+ * - +WestGravity+       - text left-center placed at left-center
+ * - +CenterGravity+     - text center placed at center
+ * - +EastGravity+       - text right-center placed at right-center
+ * - +SouthWestGravity+  - text top-left placed at bottom-left
+ * - +SouthGravity+      - text top-center placed at bottom-center
+ * - +SouthEastGravity+  - text top-right placed at bottom-right
+ *
+ * @param grav [Magick::GravityType] this gravity type
+ * @return [Magick::GravityType] the given gravity type
  */
 VALUE
 Draw_gravity_eq(VALUE self, VALUE grav)
@@ -379,7 +354,7 @@ Draw_gravity_eq(VALUE self, VALUE grav)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     VALUE_TO_ENUM(grav, draw->info->gravity, GravityType);
 
     return grav;
@@ -387,17 +362,10 @@ Draw_gravity_eq(VALUE self, VALUE grav)
 
 
 /**
- * Space between two letters.
- *
- * Ruby usage:
- *   - @verbatim Draw#gravity=float @endverbatim
+ * Set kerning as spacing between two letters.
  *
- * Notes:
- *   - New for ImageMagick 6.4.7-8
- *
- * @param self this object
- * @param kerning the kerning
- * @return kerning
+ * @param kerning [Float] the kerning
+ * @return [Float] the given kerning
  */
 VALUE
 Draw_kerning_eq(VALUE self, VALUE kerning)
@@ -405,24 +373,17 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->kerning = NUM2DBL(kerning);
     return kerning;
 }
 
 
 /**
- * Space between two lines.
- *
- * Ruby usage:
- *   - @verbatim Draw#interline_spacing= @endverbatim
- *
- * Notes:
- *   - New for ImageMagick 6.5.5-8
+ * Set spacing between two lines.
  *
- * @param self this object
- * @param spacing the spacing
- * @return spacing
+ * @param spacing [Float] the spacing
+ * @return [Float] the given spacing
  */
 VALUE
 Draw_interline_spacing_eq(VALUE self, VALUE spacing)
@@ -430,24 +391,17 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->interline_spacing = NUM2DBL(spacing);
     return spacing;
 }
 
 
 /**
- * Space between two words.
- *
- * Ruby usage:
- *   - @verbatim Draw#interword_spacing= @endverbatim
+ * Set spacing between two words.
  *
- * Notes:
- *   - New for ImageMagick 6.4.8-0
- *
- * @param self this object
- * @param spacing the spacing
- * @return spacing
+ * @param spacing [Float] the spacing
+ * @return [Float] the given spacing
  */
 VALUE
 Draw_interword_spacing_eq(VALUE self, VALUE spacing)
@@ -455,7 +409,7 @@ Draw_interword_spacing_eq(VALUE self, VALUE spacing)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->interword_spacing = NUM2DBL(spacing);
     return spacing;
 }
@@ -477,16 +431,18 @@ static VALUE
 image_to_str(Image *image)
 {
     VALUE dimg = Qnil;
-    unsigned char *blob;
-    size_t length;
-    Info *info;
-    ExceptionInfo *exception;
 
     if (image)
     {
+        unsigned char *blob;
+        size_t length;
+        Info *info;
+        ExceptionInfo *exception;
+
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
-        blob = ImageToBlob(info, image, &length, exception);
+        GVL_STRUCT_TYPE(ImageToBlob) args = { info, image, &length, exception };
+        blob = (unsigned char *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ImageToBlob), &args);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
@@ -516,14 +472,16 @@ static
 Image *str_to_image(VALUE str)
 {
     Image *image = NULL;
-    Info *info;
-    ExceptionInfo *exception;
 
     if (str != Qnil)
     {
+        Info *info;
+        ExceptionInfo *exception;
+
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
-        image = BlobToImage(info, RSTRING_PTR(str), RSTRING_LEN(str), exception);
+        GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(str), RSTRING_LEN(str), exception };
+        image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
@@ -534,21 +492,16 @@ Image *str_to_image(VALUE str)
 
 
 /**
- * Custom marshal for Draw objects.
- *
- * Ruby usage:
- *   - @verbatim Draw#marshal_dump @endverbatim
+ * Dump custom marshal for Draw objects.
  *
- * Notes:
- *   - Instead of trying to replicate Ruby's support for cross-system
- *     marshalling, exploit it. Convert the Draw fields to Ruby objects and
- *     store them in a hash. Let Ruby marshal the hash.
- *   - Commented out code that dumps/loads fields that are used internally by
- *     ImageMagick and shouldn't be marshaled. I left the code as placeholders
- *     so I'll know which fields have been deliberately omitted.
+ * - Instead of trying to replicate Ruby's support for cross-system
+ *   marshalling, exploit it. Convert the Draw fields to Ruby objects and
+ *   store them in a hash. Let Ruby marshal the hash.
+ * - Commented out code that dumps/loads fields that are used internally by
+ *   ImageMagick and shouldn't be marshaled. I left the code as placeholders
+ *   so I'll know which fields have been deliberately omitted.
  *
- * @param self this object
- * @return the marshalled object (as a Ruby hash)
+ * @return [Hash] the marshalled object
  * @todo Handle gradients when christy gets the new gradient support added (23Dec08)
  */
 VALUE
@@ -557,7 +510,7 @@ Draw_marshal_dump(VALUE self)
     Draw *draw;
     VALUE ddraw;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     // Raise an exception if the Draw has a non-NULL gradient or element_reference field
     if (draw->info->element_reference.type != UndefinedReference
@@ -568,31 +521,17 @@ Draw_marshal_dump(VALUE self)
 
     ddraw = rb_hash_new();
 
-    // rb_hash_aset(ddraw, CSTR2SYM("primitive"), MAGICK_STRING_TO_OBJ(draw->info->primitive)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("geometry"), MAGICK_STRING_TO_OBJ(draw->info->geometry)); set by "text" primitive
-    // rb_hash_aset(ddraw, CSTR2SYM("viewbox"), Import_RectangleInfo(&draw->info->viewbox)); internal
     rb_hash_aset(ddraw, CSTR2SYM("affine"), Import_AffineMatrix(&draw->info->affine));
     rb_hash_aset(ddraw, CSTR2SYM("gravity"), INT2FIX(draw->info->gravity));
     rb_hash_aset(ddraw, CSTR2SYM("fill"), Pixel_from_PixelColor(&draw->info->fill));
     rb_hash_aset(ddraw, CSTR2SYM("stroke"), Pixel_from_PixelColor(&draw->info->stroke));
     rb_hash_aset(ddraw, CSTR2SYM("stroke_width"), rb_float_new(draw->info->stroke_width));
-    // rb_hash_aset(ddraw, CSTR2SYM("gradient"), Qnil);  // not used yet
     rb_hash_aset(ddraw, CSTR2SYM("fill_pattern"), image_to_str(draw->info->fill_pattern));
-    rb_hash_aset(ddraw, CSTR2SYM("tile"), Qnil); // deprecated
     rb_hash_aset(ddraw, CSTR2SYM("stroke_pattern"), image_to_str(draw->info->stroke_pattern));
     rb_hash_aset(ddraw, CSTR2SYM("stroke_antialias"), draw->info->stroke_antialias ? Qtrue : Qfalse);
     rb_hash_aset(ddraw, CSTR2SYM("text_antialias"), draw->info->text_antialias ? Qtrue : Qfalse);
-    // rb_hash_aset(ddraw, CSTR2SYM("fill_rule"), INT2FIX(draw->info->fill_rule)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("linecap"), INT2FIX(draw->info->linecap));
-    // rb_hash_aset(ddraw, CSTR2SYM("linejoin"), INT2FIX(draw->info->linejoin));
-    // rb_hash_aset(ddraw, CSTR2SYM("miterlimit"), ULONG2NUM(draw->info->miterlimit));
-    // rb_hash_aset(ddraw, CSTR2SYM("dash_offset"), rb_float_new(draw->info->dash_offset));
     rb_hash_aset(ddraw, CSTR2SYM("decorate"), INT2FIX(draw->info->decorate));
-    // rb_hash_aset(ddraw, CSTR2SYM("compose"), INT2FIX(draw->info->compose)); set via "image" primitive
-    // rb_hash_aset(ddraw, CSTR2SYM("text"), MAGICK_STRING_TO_OBJ(draw->info->text)); set via "text" primitive
-    // rb_hash_aset(ddraw, CSTR2SYM("face"), Qnil);  internal
     rb_hash_aset(ddraw, CSTR2SYM("font"), MAGICK_STRING_TO_OBJ(draw->info->font));
-    // rb_hash_aset(ddraw, CSTR2SYM("metrics"), Qnil);   internal
     rb_hash_aset(ddraw, CSTR2SYM("family"), MAGICK_STRING_TO_OBJ(draw->info->family));
     rb_hash_aset(ddraw, CSTR2SYM("style"), INT2FIX(draw->info->style));
     rb_hash_aset(ddraw, CSTR2SYM("stretch"), INT2FIX(draw->info->stretch));
@@ -602,39 +541,27 @@ Draw_marshal_dump(VALUE self)
     rb_hash_aset(ddraw, CSTR2SYM("density"), MAGICK_STRING_TO_OBJ(draw->info->density));
     rb_hash_aset(ddraw, CSTR2SYM("align"), INT2FIX(draw->info->align));
     rb_hash_aset(ddraw, CSTR2SYM("undercolor"), Pixel_from_PixelColor(&draw->info->undercolor));
-    // rb_hash_aset(ddraw, CSTR2SYM("border_color"), Pixel_from_PixelColor(&draw->info->border_color)); Montage and Polaroid
-    // rb_hash_aset(ddraw, CSTR2SYM("server_name"), MAGICK_STRING_TO_OBJ(draw->info->server_name));
-    // rb_hash_aset(ddraw, CSTR2SYM("dash_pattern"), dash_pattern_to_array(draw->info->dash_pattern)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("clip_mask"), MAGICK_STRING_TO_OBJ(draw->info->clip_mask)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("bounds"), Import_SegmentInfo(&draw->info->bounds)); internal
     rb_hash_aset(ddraw, CSTR2SYM("clip_units"), INT2FIX(draw->info->clip_units));
+#if defined(IMAGEMAGICK_7)
+    rb_hash_aset(ddraw, CSTR2SYM("alpha"), QUANTUM2NUM(draw->info->alpha));
+#else
     rb_hash_aset(ddraw, CSTR2SYM("opacity"), QUANTUM2NUM(draw->info->opacity));
-    // rb_hash_aset(ddraw, CSTR2SYM("render"), draw->info->render ? Qtrue : Qfalse); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("element_reference"), Qnil);     // not used yet
-    // rb_hash_aset(ddraw, CSTR2SYM("debug"), draw->info->debug ? Qtrue : Qfalse);
+#endif
     rb_hash_aset(ddraw, CSTR2SYM("kerning"), rb_float_new(draw->info->kerning));
     rb_hash_aset(ddraw, CSTR2SYM("interword_spacing"), rb_float_new(draw->info->interword_spacing));
 
     // Non-DrawInfo fields
     rb_hash_aset(ddraw, CSTR2SYM("primitives"), draw->primitives);
-    // rb_hash_aset(ddraw, CSTR2SYM("shadow_color"), Pixel_from_PixelColor(&draw->shadow_color)); Polaroid-only
 
     return ddraw;
 }
 
 
 /**
- * Support Marsal.load.
- *
- * Ruby usage:
- *   - @verbatim Draw#marshal_load @endverbatim
- *
- * Notes:
- *   - On entry all fields are all-bits-0
+ * Load the marshalled object
  *
- * @param self this object
- * @param ddraw the marshalled object
- * @return self, once marshalled
+ * @param ddraw [Hash] the marshalled object
+ * @return [Magick::Draw] self, once marshalled
  */
 VALUE
 Draw_marshal_load(VALUE self, VALUE ddraw)
@@ -642,12 +569,17 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     Draw *draw;
     VALUE val;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
-    OBJ_TO_MAGICK_STRING(draw->info->geometry, rb_hash_aref(ddraw, CSTR2SYM("geometry")));
+    if (draw->info == NULL)
+    {
+        ImageInfo *image_info;
 
-    //val = rb_hash_aref(ddraw, CSTR2SYM("viewbox"));
-    //Export_RectangleInfo(&draw->info->viewbox, val);
+        image_info = CloneImageInfo(NULL);
+        draw->info = CloneDrawInfo(image_info, (DrawInfo *) NULL);
+        DestroyImageInfo(image_info);
+    }
+    OBJ_TO_MAGICK_STRING(draw->info->geometry, rb_hash_aref(ddraw, CSTR2SYM("geometry")));
 
     val = rb_hash_aref(ddraw, CSTR2SYM("affine"));
     Export_AffineMatrix(&draw->info->affine, val);
@@ -681,7 +613,11 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     Color_to_PixelColor(&draw->info->undercolor, val);
 
     draw->info->clip_units = FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("clip_units")));
+#if defined(IMAGEMAGICK_7)
+    draw->info->alpha = NUM2QUANTUM(rb_hash_aref(ddraw, CSTR2SYM("alpha")));
+#else
     draw->info->opacity = NUM2QUANTUM(rb_hash_aref(ddraw, CSTR2SYM("opacity")));
+#endif
     draw->info->kerning = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("kerning")));
     draw->info->interword_spacing = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("interword_spacing")));
 
@@ -694,14 +630,10 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
 
 
 /**
- * Pointsize attribute writer.
+ * Set point size to draw text.
  *
- * Ruby usage:
- *   - @verbatim Draw#pointsize= @endverbatim
- *
- * @param self this object
- * @param pointsize the pointsize
- * @return pointsize
+ * @param pointsize [Float] the pointsize
+ * @return [Float] the given pointsize
  */
 VALUE
 Draw_pointsize_eq(VALUE self, VALUE pointsize)
@@ -709,26 +641,17 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->pointsize = NUM2DBL(pointsize);
     return pointsize;
 }
 
 
 /**
- * Set rotation attribute value.
- *
- * Ruby usage:
- *   - @verbatim Magick::Draw#rotation= @endverbatim
+ * Set rotation. The argument should be in degrees.
  *
- * Notes:
- *   - Argument should be in degrees
- *   - Taken from Magick++'s Magick::Image::annotate method.
- *     Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002
- *
- * @param self this object
- * @param deg the number of degrees
- * @return deg
+ * @param deg [Float] the number of degrees
+ * @return [Float] the given degrees
  */
 VALUE
 Draw_rotation_eq(VALUE self, VALUE deg)
@@ -738,29 +661,24 @@ Draw_rotation_eq(VALUE self, VALUE deg)
     AffineMatrix affine, current;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     degrees = NUM2DBL(deg);
     if (fabs(degrees) > DBL_EPSILON)
     {
-        affine.sx=1.0;
-        affine.rx=0.0;
-        affine.ry=0.0;
-        affine.sy=1.0;
-        affine.tx=0.0;
-        affine.ty=0.0;
-
-        current = draw->info->affine;
-        affine.sx=cos(DegreesToRadians(fmod(degrees,360.0)));
-        affine.rx=sin(DegreesToRadians(fmod(degrees,360.0)));
-        affine.ry=(-sin(DegreesToRadians(fmod(degrees,360.0))));
-        affine.sy=cos(DegreesToRadians(fmod(degrees,360.0)));
-
-        draw->info->affine.sx=current.sx*affine.sx+current.ry*affine.rx;
-        draw->info->affine.rx=current.rx*affine.sx+current.sy*affine.rx;
-        draw->info->affine.ry=current.sx*affine.ry+current.ry*affine.sy;
-        draw->info->affine.sy=current.rx*affine.ry+current.sy*affine.sy;
-        draw->info->affine.tx=current.sx*affine.tx+current.ry*affine.ty+current.tx;
+        current   = draw->info->affine;
+        affine.sx = cos(DegreesToRadians(fmod(degrees, 360.0)));
+        affine.rx = sin(DegreesToRadians(fmod(degrees, 360.0)));
+        affine.tx = 0.0;
+        affine.ry = (-sin(DegreesToRadians(fmod(degrees, 360.0))));
+        affine.sy = cos(DegreesToRadians(fmod(degrees, 360.0)));
+        affine.ty = 0.0;
+
+        draw->info->affine.sx = current.sx*affine.sx+current.ry*affine.rx;
+        draw->info->affine.rx = current.rx*affine.sx+current.sy*affine.rx;
+        draw->info->affine.ry = current.sx*affine.ry+current.ry*affine.sy;
+        draw->info->affine.sy = current.rx*affine.ry+current.sy*affine.sy;
+        draw->info->affine.tx = current.sx*affine.tx+current.ry*affine.ty+current.tx;
     }
 
     return deg;
@@ -768,14 +686,10 @@ Draw_rotation_eq(VALUE self, VALUE deg)
 
 
 /**
- * Stroke attribute writer.
+ * Set stroke.
  *
- * Ruby usage:
- *   - @verbatim Draw#stroke= @endverbatim
- *
- * @param self this object
- * @param stroke the stroke
- * @return stroke
+ * @param stroke [Magick::Pixel, String] the stroke
+ * @return [Magick::Pixel, String] the given stroke
  */
 VALUE
 Draw_stroke_eq(VALUE self, VALUE stroke)
@@ -783,7 +697,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->stroke, stroke);
     return stroke;
 }
@@ -792,22 +706,18 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
 /**
  * Accept an image as a stroke pattern.
  *
- * Ruby usage:
- *   - @verbatim Draw#stroke_pattern= @endverbatim
- *
- * @param self this object
- * @param pattern the pattern
- * @return pattern
- * @see Draw_fill_pattern_eq
+ * @param pattern [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *   imagelist, uses the current image.
+ * @return [Magick::Image] the given pattern
+ * @see #fill_pattern
  */
 VALUE
 Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
 {
     Draw *draw;
-    Image *image;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->info->stroke_pattern != NULL)
     {
@@ -818,6 +728,8 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
 
     if (!NIL_P(pattern))
     {
+        Image *image;
+
         // DestroyDrawInfo destroys the clone
         pattern = rm_cur_image(pattern);
         image = rm_check_destroyed(pattern);
@@ -830,14 +742,10 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
 
 
 /**
- * Stroke_width attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#stroke_width= @endverbatim
+ * Set stroke width.
  *
- * @param self this object
- * @param stroke_width the stroke_width
- * @return stroke_width
+ * @param stroke_width [Float] the stroke width
+ * @return [Float] the given stroke width
  */
 VALUE
 Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
@@ -845,21 +753,17 @@ Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->stroke_width = NUM2DBL(stroke_width);
     return stroke_width;
 }
 
 
 /**
- * Text_antialias attribute writer.
+ * Set whether to enable text antialias.
  *
- * Ruby usage:
- *   - @verbatim Draw#text_antialias= @endverbatim
- *
- * @param self this object
- * @param text_antialias the text_antialias
- * @return text_antialias
+ * @param text_antialias [Boolean] true if enable text antialias
+ * @return [Boolean] the given value
  */
 VALUE
 Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
@@ -867,21 +771,17 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     draw->info->text_antialias = (MagickBooleanType) RTEST(text_antialias);
     return text_antialias;
 }
 
 
 /**
- * Tile attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#tile= @endverbatim
+ * Accept an image as a fill pattern. This is alias of {Draw#fill_pattern=}.
  *
- * @param self this object
- * @param image the image to tile
- * @return image
+ * @param image [Magick::Image] the image to tile
+ * @return [Magick::Image] the given image
  */
 VALUE
 Draw_tile_eq(VALUE self, VALUE image)
@@ -891,14 +791,10 @@ Draw_tile_eq(VALUE self, VALUE image)
 
 
 /**
- * Undercolor attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#undercolor= @endverbatim
+ * Set undercolor.
  *
- * @param self this object
- * @param undercolor the undercolor
- * @return undercolor
+ * @param undercolor [Magick::Pixel, String] the undercolor
+ * @return [Magick::Pixel, String] the given undercolor
  */
 VALUE
 Draw_undercolor_eq(VALUE self, VALUE undercolor)
@@ -906,7 +802,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->undercolor, undercolor);
     return undercolor;
 }
@@ -915,21 +811,17 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
 /**
  * Annotates an image with text.
  *
- * Ruby usage:
- *   - @verbatim Draw#annotate(img, w, h, x, y, text) <{optional parms}> @endverbatim
- *
- * Notes:
- *   - Additional Draw attribute methods may be called in the optional block,
- *     which is executed in the context of an Draw object.
- *
- * @param self this object
- * @param image_arg the image
- * @param width_arg the width
- * @param height_arg the height
- * @param x_arg x position
- * @param y_arg y position
- * @param text the annotation text
- * @return self
+ * - Additional Draw attribute methods may be called in the optional block,
+ *   which is executed in the context of an Draw object.
+ *
+ * @param image_arg [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *   imagelist, uses the current image.
+ * @param width_arg [Numeric] the width
+ * @param height_arg [Numeric] the height
+ * @param x_arg [Numeric] x position
+ * @param y_arg [Numeric] y position
+ * @param text [String] the annotation text
+ * @return [Magick::Draw] self
  */
 VALUE Draw_annotate(
                    VALUE self,
@@ -946,10 +838,14 @@ VALUE Draw_annotate(
     long x, y;
     AffineMatrix keep;
     char geometry_str[100];
+    char *embed_text;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     // Save the affine matrix in case it is modified by
     // Draw#rotation=
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     keep = draw->info->affine;
 
     image_arg = rm_cur_image(image_arg);
@@ -959,13 +855,30 @@ VALUE Draw_annotate(
     // allowing the app a chance to modify the object's attributes
     if (rb_block_given_p())
     {
-        (void)rb_obj_instance_eval(0, NULL, self);
+        rb_yield(self);
     }
 
     // Translate & store in Draw structure
-    draw->info->text = InterpretImageProperties(NULL, image, StringValuePtr(text));
+    embed_text = StringValueCStr(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");
     }
 
@@ -978,24 +891,34 @@ VALUE Draw_annotate(
 
     if (width == 0 && height == 0)
     {
-        sprintf(geometry_str, "%+ld%+ld", x, y);
+        snprintf(geometry_str, sizeof(geometry_str), "%+ld%+ld", x, y);
     }
 
     // WxH is non-zero
     else
     {
-        sprintf(geometry_str, "%lux%lu%+ld%+ld", width, height, x, y);
+        snprintf(geometry_str, sizeof(geometry_str), "%lux%lu%+ld%+ld", width, height, x, y);
     }
 
     magick_clone_string(&draw->info->geometry, geometry_str);
 
-    (void) AnnotateImage(image, draw->info);
+#if defined(IMAGEMAGICK_7)
+    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info, exception };
+#else
+    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info };
+#endif
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AnnotateImage), &args);
 
     magick_free(draw->info->text);
     draw->info->text = NULL;
     draw->info->affine = keep;
 
+#if defined(IMAGEMAGICK_7)
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
+#else
     rm_check_image_exception(image, RetainOnError);
+#endif
 
     return self;
 }
@@ -1004,13 +927,7 @@ VALUE Draw_annotate(
 /**
  * Clones this object.
  *
- * Ruby usage:
- *   - @verbatim Draw#clone @endverbatim
- *
- * @param self this object
- * @return the clone
- * @see Draw_dup
- * @see Draw_init_copy
+ * @return [Magick::Draw] the cloned object
  */
 VALUE
 Draw_clone(VALUE self)
@@ -1030,21 +947,28 @@ Draw_clone(VALUE self)
 
 
 /**
- * Implement the "image" drawing primitive.
- *
- * Ruby usage:
- *   - @verbatim Draw#composite(x,y,width,height,img) @endverbatim
- *   - @verbatim Draw#composite(x,y,width,height,img,operator) @endverbatim
- *
- * Notes:
- *   - Default operator is overComposite
- *   - The "img" argument can be either an ImageList object or an Image
+ * Draw the image.
+ *
+ * @overload composite(x, y, width, height, image)
+ *   @param x [Float] x position
+ *   @param y [Float] y position
+ *   @param width [Float] the width
+ *   @param height [Float] the height
+ *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *     imagelist, uses the current image.
+ *
+ * @overload composite(x, y, width, height, image, operator = Magick::OverCompositeOp)
+ *   - The "image" argument can be either an ImageList object or an Image
  *     argument.
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return self
+ *   @param x [Float] x position
+ *   @param y [Float] y position
+ *   @param width [Float] the width
+ *   @param height [Float] the height
+ *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *     imagelist, uses the current image.
+ *   @param operator [Magick::CompositeOperator] the operator
+ *
+ * @return [Magick::Draw] self
  */
 VALUE
 Draw_composite(int argc, VALUE *argv, VALUE self)
@@ -1086,25 +1010,25 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "unknown composite operator (%d)", cop);
     }
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     // Create a temp copy of the composite image
-    rm_write_temp_image(comp_img, name);
+    rm_write_temp_image(comp_img, name, sizeof(name));
 
     // Add the temp filename to the filename array.
     // Use Magick storage since we need to keep the list around
     // until destroy_Draw is called.
-    tmpfile_name = magick_malloc(sizeof(struct TmpFile_Name)+strlen(name));
+    tmpfile_name = magick_malloc(sizeof(struct TmpFile_Name) + rm_strnlen_s(name, sizeof(name)));
     strcpy(tmpfile_name->name, name);
     tmpfile_name->next = draw->tmpfile_ary;
     draw->tmpfile_ary = tmpfile_name;
 
     // Form the drawing primitive
-    (void) snprintf(primitive, sizeof(primitive), "image %s %g,%g,%g,%g '%s'", op, x, y, width, height, name);
+    snprintf(primitive, sizeof(primitive), "image %s %g,%g,%g,%g '%s'", op, x, y, width, height, name);
 
 
     // Send "primitive" to self.
-    (void) rb_funcall(self, rb_intern("primitive"), 1, rb_str_new2(primitive));
+    rb_funcall(self, rb_intern("primitive"), 1, rb_str_new2(primitive));
 
     RB_GC_GUARD(image);
 
@@ -1115,54 +1039,59 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
 /**
  * Execute the stored drawing primitives on the current image.
  *
- * Ruby usage:
- *   - @verbatim Draw#draw(i) @endverbatim
- *
- * @param self this object
- * @param image_arg the image argument
- * @return self
+ * @param image_arg [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *   imagelist, uses the current image.
+ * @return [Magick::Draw] self
  */
 VALUE
 Draw_draw(VALUE self, VALUE image_arg)
 {
     Draw *draw;
     Image *image;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     image_arg = rm_cur_image(image_arg);
     image = rm_check_frozen(image_arg);
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     if (draw->primitives == 0)
     {
         rb_raise(rb_eArgError, "nothing to draw");
     }
 
     // Point the DrawInfo structure at the current set of primitives.
-    magick_clone_string(&(draw->info->primitive), StringValuePtr(draw->primitives));
+    magick_clone_string(&(draw->info->primitive), StringValueCStr(draw->primitives));
 
-    (void) DrawImage(image, draw->info);
-    rm_check_image_exception(image, RetainOnError);
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    GVL_STRUCT_TYPE(DrawImage) args = { image, draw->info, exception };
+#else
+    GVL_STRUCT_TYPE(DrawImage) args = { image, draw->info };
+#endif
+    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(DrawImage), &args);
 
     magick_free(draw->info->primitive);
     draw->info->primitive = NULL;
 
+#if defined(IMAGEMAGICK_7)
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
+#else
+    rm_check_image_exception(image, RetainOnError);
+#endif
+
     return self;
 }
 
 
 /**
- * Copy a Draw object.
+ * Duplicate a Draw object.
  *
- * Ruby usage:
- *   - @verbatim Draw#dup @endverbatim
+ * - Constructs a new Draw object, then calls initialize_copy.
  *
- * Notes:
- *   - Constructs a new Draw object, then calls initialize_copy.
- *
- * @param self this object
- * @return the duplicate
- * @see Draw_clone
- * @see Draw_init_copy
+ * @return [Magick::Draw] the duplicated object
  */
 VALUE
 Draw_dup(VALUE self)
@@ -1172,12 +1101,7 @@ Draw_dup(VALUE self)
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
-    dup = Data_Wrap_Struct(CLASS_OF(self), mark_Draw, destroy_Draw, draw);
-    if (rb_obj_tainted(self))
-    {
-        (void)rb_obj_taint(dup);
-    }
-
+    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);
@@ -1187,19 +1111,19 @@ Draw_dup(VALUE self)
 /**
  * Returns measurements for a given font and text string.
  *
- * Ruby usage:
- *   - @verbatim Draw#get_type_metrics(text) @endverbatim
- *   - @verbatim Draw#get_type_metrics(image, text) @endverbatim
+ * - If the image argument has been omitted, use a dummy image, but make sure
+ *   the text has none of the special characters that refer to image
+ *   attributes.
  *
- * Notes:
- *   - If the image argument has been omitted, use a dummy image, but make sure
- *     the text has none of the special characters that refer to image
- *     attributes.
+ * @overload get_type_metrics(text)
+ *   @param text [String] The string to be rendered.
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return the duplicate
+ * @overload get_type_metrics(image, text)
+ *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *     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.
  */
 VALUE
 Draw_get_type_metrics(
@@ -1207,26 +1131,26 @@ Draw_get_type_metrics(
                      VALUE *argv,
                      VALUE self)
 {
-    return get_type_metrics(argc, argv, self, GetTypeMetrics);
+    return get_type_metrics(argc, argv, self, GVL_FUNC(GetTypeMetrics));
 }
 
 
 /**
  * Returns measurements for a given font and text string.
  *
- * Ruby usage:
- *   - @verbatim Draw#get_multiline_type_metrics(text) @endverbatim
- *   - @verbatim Draw#get_multiline_type_metrics(image, text) @endverbatim
+ * - If the image argument has been omitted, use a dummy image, but make sure
+ *   the text has none of the special characters that refer to image
+ *   attributes.
  *
- * Notes:
- *   - If the image argument has been omitted, use a dummy image, but make sure
- *     the text has none of the special characters that refer to image
- *     attributes.
+ * @overload get_multiline_type_metrics(text)
+ *   @param text [String] The string to be rendered.
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return the duplicate
+ * @overload Draw#get_multiline_type_metrics(image, text)
+ *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *     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.
  */
 VALUE
 Draw_get_multiline_type_metrics(
@@ -1234,28 +1158,22 @@ Draw_get_multiline_type_metrics(
                                VALUE *argv,
                                VALUE self)
 {
-    return get_type_metrics(argc, argv, self, GetMultilineTypeMetrics);
+    return get_type_metrics(argc, argv, self, GVL_FUNC(GetMultilineTypeMetrics));
 }
 
 
 /**
  * Initialize clone, dup methods.
  *
- * Ruby usage:
- *   - @verbatim Draw#initialize_copy @endverbatim
- *
- * @param self this object
  * @param orig the original object
- * @return self
- * @see Draw_clone
- * @see Draw_dup
+ * @return [Magick::Draw] self
  */
 VALUE Draw_init_copy(VALUE self, VALUE orig)
 {
     Draw *copy, *original;
 
-    Data_Get_Struct(orig, Draw, original);
-    Data_Get_Struct(self, Draw, copy);
+    TypedData_Get_Struct(orig, Draw, &rm_draw_data_type, original);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, copy);
 
     copy->info = CloneDrawInfo(NULL, original->info);
     if (!copy->info)
@@ -1275,11 +1193,7 @@ VALUE Draw_init_copy(VALUE self, VALUE orig)
 /**
  * Initialize Draw object.
  *
- * Ruby usage:
- *   - @verbatim Draw#initialize <{ info initializers }> @endverbatim
- *
- * @param self this object
- * @return self
+ * @return [Magick::Draw] self
  */
 VALUE
 Draw_initialize(VALUE self)
@@ -1287,10 +1201,10 @@ Draw_initialize(VALUE self)
     Draw *draw, *draw_options;
     VALUE options;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     options = new_DrawOptions();
-    Data_Get_Struct(options, Draw, draw_options);
+    TypedData_Get_Struct(options, Draw, &rm_draw_data_type, draw_options);
     draw->info = draw_options->info;
     draw_options->info = NULL;
 
@@ -1303,19 +1217,15 @@ Draw_initialize(VALUE self)
 /**
  * Display the primitives.
  *
- * Ruby usage:
- *   - @verbatim Draw#inspect @endverbatim
- *
- * @param self this object
- * @return the draw primitives or the Ruby string "(no primitives defined)" if
- * they are not defined
+ * @return [String] the draw primitives or the Ruby string "(no primitives defined)"
+ *   if they are not defined
  */
 VALUE
 Draw_inspect(VALUE self)
 {
     Draw *draw;
 
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     return draw->primitives ? draw->primitives : rb_str_new2("(no primitives defined)");
 }
 
@@ -1323,13 +1233,7 @@ Draw_inspect(VALUE self)
 /**
  * Create a new Draw object.
  *
- * Ruby usage:
- *   - @verbatim Draw.new @endverbatim
- *   - @verbatim Draw.allocate @endverbatim
- *
- * @param class the Ruby Draw class
- * @return a new Draw object
- * @throw ImageMagickError if no memory
+ * @return [Magick::Draw] a new Draw object
  */
 VALUE Draw_alloc(VALUE class)
 {
@@ -1338,7 +1242,7 @@ VALUE Draw_alloc(VALUE class)
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
-    draw_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw);
+    draw_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw);
 
     RB_GC_GUARD(draw_obj);
 
@@ -1349,12 +1253,8 @@ VALUE Draw_alloc(VALUE class)
 /**
  * Add a drawing primitive to the list of primitives in the Draw object.
  *
- * Ruby usage:
- *   - @verbatim Draw#primitive @endverbatim
- *
- * @param self this object
- * @param primitive the primitive to add
- * @return self
+ * @param primitive [String] the primitive to add
+ * @return [Magick::Draw] self
  */
 VALUE
 Draw_primitive(VALUE self, VALUE primitive)
@@ -1362,7 +1262,7 @@ Draw_primitive(VALUE self, VALUE primitive)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     if (draw->primitives == (VALUE)0)
     {
@@ -1370,13 +1270,32 @@ Draw_primitive(VALUE self, VALUE primitive)
     }
     else
     {
-        draw->primitives = rb_str_concat(draw->primitives, rb_str_new2("\n"));
+        draw->primitives = rb_str_plus(draw->primitives, rb_str_new2("\n"));
         draw->primitives = rb_str_concat(draw->primitives, primitive);
     }
 
     return self;
 }
 
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+/**
+ * Compact the objects.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param drawptr pointer to a Draw object
+ */
+static void
+Draw_compact(void *drawptr)
+{
+    Draw *draw = (Draw *)drawptr;
+
+    if (draw->primitives != (VALUE)0)
+    {
+        draw->primitives = rb_gc_location(draw->primitives);
+    }
+}
+#endif
 
 /**
  * Mark referenced objects.
@@ -1386,13 +1305,17 @@ Draw_primitive(VALUE self, VALUE primitive)
  * @param drawptr pointer to a Draw object
  */
 static void
-mark_Draw(void *drawptr)
+Draw_mark(void *drawptr)
 {
     Draw *draw = (Draw *)drawptr;
 
     if (draw->primitives != (VALUE)0)
     {
+#ifdef HAVE_RB_GC_MARK_MOVABLE
+        rb_gc_mark_movable(draw->primitives);
+#else
         rb_gc_mark(draw->primitives);
+#endif
     }
 }
 
@@ -1405,20 +1328,21 @@ mark_Draw(void *drawptr)
  * @param drawptr pointer to a Draw object
  */
 static void
-destroy_Draw(void *drawptr)
+Draw_destroy(void *drawptr)
 {
     Draw *draw = (Draw *)drawptr;
-    struct TmpFile_Name *tmpfile_name;
 
     if (draw->info)
     {
-        (void) DestroyDrawInfo(draw->info);
+        DestroyDrawInfo(draw->info);
         draw->info = NULL;
     }
 
     // Erase any temporary image files.
     while (draw->tmpfile_ary)
     {
+        struct TmpFile_Name *tmpfile_name;
+
         tmpfile_name = draw->tmpfile_ary;
         draw->tmpfile_ary = draw->tmpfile_ary->next;
         rm_delete_temp_image(tmpfile_name->name);
@@ -1428,6 +1352,18 @@ destroy_Draw(void *drawptr)
     xfree(drawptr);
 }
 
+/**
+  * Get Draw object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param infoptr pointer to the Draw object
+  */
+static size_t
+Draw_memsize(const void *drawptr)
+{
+    return sizeof(Draw);
+}
 
 /**
  * Allocate & initialize a DrawOptions object.
@@ -1446,16 +1382,10 @@ new_DrawOptions(void)
 /**
  * Create a DrawOptions object.
  *
- * Ruby usage:
- *   - @verbatim DrawOptions#allocate @endverbatim
- *   - @verbatim DrawOptions#new @endverbatim
- *
- * Notes:
- *   - The DrawOptions class is the same as the Draw class except is has only
- *     the attribute writer functions
+ * - The DrawOptions class is the same as the Draw class except is has only
+ *   the attribute writer functions
  *
- * @param class the Ruby DrawOptions class
- * @return a new DrawOptions object
+ * @return [Magick::Image::DrawOptions] a new DrawOptions object
  */
 VALUE
 DrawOptions_alloc(VALUE class)
@@ -1465,7 +1395,7 @@ DrawOptions_alloc(VALUE class)
 
     draw_options = ALLOC(Draw);
     memset(draw_options, 0, sizeof(Draw));
-    draw_options_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw_options);
+    draw_options_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw_options);
 
     RB_GC_GUARD(draw_options_obj);
 
@@ -1476,30 +1406,23 @@ DrawOptions_alloc(VALUE class)
 /**
  * Initialize a DrawOptions object.
  *
- * Ruby usage:
- *   - @verbatim DrawOptions#initialize @endverbatim
- *
- * @param self this object
- * @return self
+ * @return [Magick::Image::DrawOptions] self
  */
 VALUE
 DrawOptions_initialize(VALUE self)
 {
     Draw *draw_options;
 
-    Data_Get_Struct(self, Draw, draw_options);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw_options);
     draw_options->info = AcquireDrawInfo();
     if (!draw_options->info)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
 
-    GetDrawInfo(NULL, draw_options->info);
-
     if (rb_block_given_p())
     {
-        // Run the block in self's context
-        (void) rb_obj_instance_eval(0, NULL, self);
+        rb_yield(self);
     }
 
     return self;
@@ -1507,18 +1430,12 @@ DrawOptions_initialize(VALUE self)
 
 
 /**
- * Allocate a new Magick::PolaroidOptions object.
+ * Allocate a new Magick::Image::PolaroidOptions object.
  *
- * Ruby usage:
- *   - @verbatim Magick::PolaroidOptions#allocate @endverbatim
- *   - @verbatim Magick::PolaroidOptions#new @endverbatim
+ * - Internally a PolaroidOptions object is the same as a Draw object. The
+ *   methods are implemented by Draw methods in rmdraw.c.
  *
- * Notes:
- *   - Internally a PolaroidOptions object is the same as a Draw object. The
- *     methods are implemented by Draw methods in rmdraw.c.
- *
- * @param class the Ruby PoloradoidOptions class
- * @return a new DrawOptions object
+ * @return [Magick::Image::PolaroidOptions] a new PolaroidOptions object
  */
 VALUE
 PolaroidOptions_alloc(VALUE class)
@@ -1532,10 +1449,10 @@ PolaroidOptions_alloc(VALUE class)
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(*draw));
 
-    draw->info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
-    (void)(void) DestroyImageInfo(image_info);
+    draw->info = CloneDrawInfo(image_info, (DrawInfo *) NULL);
+    (void) DestroyImageInfo(image_info);
 
-    polaroid_obj = Data_Wrap_Struct(class, NULL, destroy_Draw, draw);
+    polaroid_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw);
 
     RB_GC_GUARD(polaroid_obj);
 
@@ -1544,13 +1461,11 @@ PolaroidOptions_alloc(VALUE class)
 
 
 /**
- * Yield to an optional block.
- *
- * Ruby usage:
- *   - @verbatim Magick::PolaroidOptions#initialize @endverbatim
+ * Initialize a PolaroidOptions object.
  *
- * @param self this object
- * @return self
+ * @yield [self]
+ * @yieldparam self [Magick::Image::PolaroidOptions] self
+ * @return [Magick::Image::PolaroidOptions] self
  */
 VALUE
 PolaroidOptions_initialize(VALUE self)
@@ -1559,20 +1474,20 @@ PolaroidOptions_initialize(VALUE self)
     ExceptionInfo *exception;
 
     // Default shadow color
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
 
     exception = AcquireExceptionInfo();
-    (void) QueryColorCompliance("gray75", AllCompliance, &draw->shadow_color, exception);
-    CHECK_EXCEPTION()
-    (void) QueryColorCompliance("#dfdfdf", AllCompliance, &draw->info->border_color, exception);
-    CHECK_EXCEPTION()
+    QueryColorCompliance("gray75", AllCompliance, &draw->shadow_color, exception);
+    CHECK_EXCEPTION();
+    QueryColorCompliance("#dfdfdf", AllCompliance, &draw->info->border_color, exception);
+    CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 
     if (rb_block_given_p())
     {
-        // Run the block in self's context
-        (void) rb_obj_instance_eval(0, NULL, self);
+        rb_yield(self);
     }
+
     return self;
 }
 
@@ -1594,12 +1509,8 @@ rm_polaroid_new(void)
 /**
  * Set the shadow color attribute.
  *
- * Ruby usage:
- *   - @verbatim PolaroidOptions#shadow_color= @endverbatim
- *
- * @param self this object
- * @param shadow the shadow color
- * @return shadow
+ * @param shadow [Magick::Pixel, String] the shadow color
+ * @return [Magick::Pixel, String] the given shadow color
  */
 VALUE
 PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
@@ -1607,21 +1518,17 @@ PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->shadow_color, shadow);
     return shadow;
 }
 
 
 /**
- * Set the border color attribute.
- *
- * Ruby usage:
- *   - @verbatim PolaroidOptions#border_color= @endverbatim
+ * Set the border color.
  *
- * @param self this object
- * @param border the border color
- * @return border
+ * @param border [Magick::Pixel, String] the border color
+ * @return [Magick::Pixel, String] the given border color
  */
 VALUE
 PolaroidOptions_border_color_eq(VALUE self, VALUE border)
@@ -1629,7 +1536,7 @@ PolaroidOptions_border_color_eq(VALUE self, VALUE border)
     Draw *draw;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Draw, draw);
+    TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
     Color_to_PixelColor(&draw->info->border_color, border);
     return border;
 }
@@ -1648,11 +1555,11 @@ get_dummy_tm_img(VALUE klass)
 {
 #define DUMMY_IMG_CLASS_VAR "@@_dummy_img_"
     VALUE dummy_img = 0;
-    Info *info;
-    Image *image;
 
     if (rb_cvar_defined(klass, rb_intern(DUMMY_IMG_CLASS_VAR)) != Qtrue)
     {
+        Info *info;
+        Image *image;
 
         info = CloneImageInfo(NULL);
         if (!info)
@@ -1660,7 +1567,7 @@ get_dummy_tm_img(VALUE klass)
             rb_raise(rb_eNoMemError, "not enough memory to continue");
         }
         image = rm_acquire_image(info);
-        (void) DestroyImageInfo(info);
+        DestroyImageInfo(info);
 
         if (!image)
         {
@@ -1678,6 +1585,9 @@ get_dummy_tm_img(VALUE klass)
 }
 
 
+// aliases for common use of structure types; GetMultilineTypeMetrics, GetTypeMetrics
+typedef GVL_STRUCT_TYPE(GetTypeMetrics) GVL_STRUCT_TYPE(get_type_metrics);
+
 /**
  * Call a get-type-metrics function.
  *
@@ -1695,11 +1605,7 @@ get_dummy_tm_img(VALUE klass)
  * @see Draw_get_multiline_type_metrics
  */
 static VALUE
-get_type_metrics(
-                int argc,
-                VALUE *argv,
-                VALUE self,
-                get_type_metrics_func_t getter)
+get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
 {
     Image *image;
     Draw *draw;
@@ -1707,13 +1613,16 @@ get_type_metrics(
     TypeMetric metrics;
     char *text = NULL;
     long text_l;
-    unsigned int okay;
+    MagickBooleanType okay;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     switch (argc)
     {
         case 1:                   // use default image
             text = rm_str2cstr(argv[0], &text_l);
-            Data_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, image);
+            TypedData_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, &rm_image_data_type, image);
             break;
         case 2:
             t = rm_cur_image(argv[0]);
@@ -1730,26 +1639,55 @@ get_type_metrics(
         rb_raise(rb_eArgError, "no text to measure");
     }
 
-    Data_Get_Struct(self, Draw, draw);
+    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");
     }
 
-    okay = (*getter)(image, draw->info, &metrics);
+#if defined(IMAGEMAGICK_7)
+    GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics, exception };
+#else
+    GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics };
+#endif
+    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(fp, &args);
 
     magick_free(draw->info->text);
     draw->info->text = NULL;
 
     if (!okay)
     {
+#if defined(IMAGEMAGICK_7)
+        CHECK_EXCEPTION();
+        DestroyExceptionInfo(exception);
+#else
         rm_check_image_exception(image, RetainOnError);
+#endif
 
         // Shouldn't get here...
         rb_raise(rb_eRuntimeError, "Can't measure text. Are the fonts installed? "
                  "Is the FreeType library installed?");
     }
+#if defined(IMAGEMAGICK_7)
+    DestroyExceptionInfo(exception);
+#endif
 
     RB_GC_GUARD(t);