rmagick 2.13.2 → 4.2.2

data/ext/RMagick/rmdraw.c

@@ -18,19 +18,19 @@ static void destroy_Draw(void *);
 static VALUE new_DrawOptions(void);
 
 /** Method that gets type metrics */
-typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *);
+#if defined(IMAGEMAGICK_7)
+    typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *, ExceptionInfo *);
+#else
+    typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *);
+#endif
 static VALUE get_type_metrics(int, VALUE *, VALUE, get_type_metrics_func_t);
 
 
 /**
- * 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 self
+ * @param matrix [Magick::AffineMatrix] the affine matrix
+ * @return [Magick::AffineMatrix] the given matrix
  */
 VALUE
 Draw_affine_eq(VALUE self, VALUE matrix)
@@ -40,19 +40,15 @@ Draw_affine_eq(VALUE self, VALUE matrix)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     Export_AffineMatrix(&draw->info->affine, matrix);
-    return self;
+    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 self
+ * @param align [Magick::AlignType] the text alignment
+ * @return [Magick::AlignType] the given align
  */
 VALUE
 Draw_align_eq(VALUE self, VALUE align)
@@ -62,19 +58,15 @@ Draw_align_eq(VALUE self, VALUE align)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     VALUE_TO_ENUM(align, draw->info->align, AlignType);
-    return self;
+    return align;
 }
 
 
 /**
- * Decorate attribute writer.
+ * Set text decorate from an {Magick::DecorationType}.
  *
- * Ruby usage:
- *   - @verbatim Draw#decorate= @endverbatim
- *
- * @param self this object
- * @param decorate the decorate
- * @return self
+ * @param decorate [Magick::DecorationType] the decorate type
+ * @return [Magick::DecorationType] the given decorate
  */
 VALUE
 Draw_decorate_eq(VALUE self, VALUE decorate)
@@ -84,19 +76,15 @@ Draw_decorate_eq(VALUE self, VALUE decorate)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     VALUE_TO_ENUM(decorate, draw->info->decorate, DecorationType);
-    return self;
+    return decorate;
 }
 
 
 /**
- * Density attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#density= @endverbatim
+ * Set density.
  *
- * @param self this object
- * @param density the density
- * @return self
+ * @param density [String] the density
+ * @return [String] the given density
  */
 VALUE
 Draw_density_eq(VALUE self, VALUE density)
@@ -105,21 +93,17 @@ Draw_density_eq(VALUE self, VALUE density)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->density, StringValuePtr(density));
+    magick_clone_string(&draw->info->density, StringValueCStr(density));
 
-    return self;
+    return density;
 }
 
 
 /**
- * Encoding attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#encoding= @endverbatim
+ * Set text encoding.
  *
- * @param self this object
- * @param encoding the encoding
- * @return self
+ * @param encoding [String] the encoding name
+ * @return [String] the given encoding name
  */
 VALUE
 Draw_encoding_eq(VALUE self, VALUE encoding)
@@ -128,21 +112,17 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->encoding, StringValuePtr(encoding));
+    magick_clone_string(&draw->info->encoding, StringValueCStr(encoding));
 
-    return self;
+    return encoding;
 }
 
 
 /**
- * Fill attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#fill= @endverbatim
+ * Set fill color.
  *
- * @param self this object
- * @param fill the fill
- * @return self
+ * @param fill [Magick::Pixel, String] the fill color
+ * @return [Magick::Pixel, String] the given fill color
  */
 VALUE
 Draw_fill_eq(VALUE self, VALUE fill)
@@ -151,28 +131,24 @@ Draw_fill_eq(VALUE self, VALUE fill)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->fill, fill);
-    return self;
+    Color_to_PixelColor(&draw->info->fill, fill);
+    return 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 self
- * @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);
@@ -186,25 +162,23 @@ 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
         draw->info->fill_pattern = rm_clone_image(image);
     }
 
-    return self;
+    return pattern;
 }
 
 
 /**
- * Font attribute writer.
+ * Set the font name.
  *
- * Ruby usage:
- *   - @verbatim Draw#font= @endverbatim
- *
- * @param self this object
- * @param font the font
- * @return self
+ * @param font [String] the font name
+ * @return [String] the given font name
  */
 VALUE
 Draw_font_eq(VALUE self, VALUE font)
@@ -213,21 +187,17 @@ Draw_font_eq(VALUE self, VALUE font)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->font, StringValuePtr(font));
+    magick_clone_string(&draw->info->font, StringValueCStr(font));
 
-    return self;
+    return font;
 }
 
 
 /**
- * Font family attribute writer.
+ * Set the font family name.
  *
- * Ruby usage:
- *   - @verbatim Draw#family= @endverbatim
- *
- * @param self this object
- * @param family the family
- * @return self
+ * @param family [String] the font family name
+ * @return [String] the given family name
  */
 VALUE
 Draw_font_family_eq(VALUE self, VALUE family)
@@ -236,21 +206,17 @@ Draw_font_family_eq(VALUE self, VALUE family)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    magick_clone_string(&draw->info->family, StringValuePtr(family));
+    magick_clone_string(&draw->info->family, StringValueCStr(family));
 
-    return self;
+    return family;
 }
 
 
 /**
- * Font_stretch attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#font_stretch= @endverbatim
+ * Set the stretch as spacing between text characters.
  *
- * @param self this object
- * @param stretch the font_stretch
- * @return self
+ * @param stretch [Magick::StretchType] the stretch type
+ * @return [Magick::StretchType] the given stretch type
  */
 VALUE
 Draw_font_stretch_eq(VALUE self, VALUE stretch)
@@ -260,19 +226,15 @@ Draw_font_stretch_eq(VALUE self, VALUE stretch)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     VALUE_TO_ENUM(stretch, draw->info->stretch, StretchType);
-    return self;
+    return stretch;
 }
 
 
 /**
- * Font_style attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#font_style= @endverbatim
+ * Set font style.
  *
- * @param self this object
- * @param style the font_style
- * @return self
+ * @param style [Magick::StyleType] the font style
+ * @return [Magick::StyleType] the given font style
  */
 VALUE
 Draw_font_style_eq(VALUE self, VALUE style)
@@ -282,39 +244,32 @@ Draw_font_style_eq(VALUE self, VALUE style)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     VALUE_TO_ENUM(style, draw->info->style, StyleType);
-    return self;
+    return style;
 }
 
 
 /**
- * Font_weight attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#font_weight= @endverbatim
- *
- * Notes:
- *   - The font weight can be one of the font weight constants or a number
- *     between 100 and 900
+ * Set font weight.
  *
- * @param self this object
- * @param weight the font_weight
- * @return self
+ * @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)
 {
     Draw *draw;
-    WeightType w;
+    size_t w;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
 
     if (FIXNUM_P(weight))
     {
-        w = (WeightType) FIX2INT(weight);
+        w = FIX2INT(weight);
         if (w < 100 || w > 900)
         {
-            rb_raise(rb_eArgError, "invalid font weight (%d given)", w);
+            rb_raise(rb_eArgError, "invalid font weight (%"RMIuSIZE" given)", w);
         }
         draw->info->weight = w;
     }
@@ -346,32 +301,26 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
         }
     }
 
-    return self;
+    return 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 self
+ * 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)
@@ -382,103 +331,61 @@ Draw_gravity_eq(VALUE self, VALUE grav)
     Data_Get_Struct(self, Draw, draw);
     VALUE_TO_ENUM(grav, draw->info->gravity, GravityType);
 
-    return self;
+    return grav;
 }
 
 
 /**
- * Space between two letters.
- *
- * Ruby usage:
- *   - @verbatim Draw#gravity=float @endverbatim
- *
- * Notes:
- *   - New for ImageMagick 6.4.7-8
+ * Set kerning as spacing between two letters.
  *
- * @param self this object
- * @param kerning the kerning
- * @return self
+ * @param kerning [Float] the kerning
+ * @return [Float] the given kerning
  */
 VALUE
 Draw_kerning_eq(VALUE self, VALUE kerning)
 {
-#if defined(HAVE_ST_KERNING)
     Draw *draw;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->kerning = NUM2DBL(kerning);
-    return self;
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    self = self;
-    kerning = kerning;
-#endif
+    return kerning;
 }
 
 
 /**
- * Space between two lines.
+ * Set spacing between two lines.
  *
- * Ruby usage:
- *   - @verbatim Draw#interline_spacing= @endverbatim
- *
- * Notes:
- *   - New for ImageMagick 6.5.5-8
- *
- * @param self this object
- * @param spacing the spacing
- * @return self
+ * @param spacing [Float] the spacing
+ * @return [Float] the given spacing
  */
 VALUE
 Draw_interline_spacing_eq(VALUE self, VALUE spacing)
 {
-#if defined(HAVE_ST_INTERLINE_SPACING)
     Draw *draw;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->interline_spacing = NUM2DBL(spacing);
-    return self;
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    self = self;
-    spacing = spacing;
-#endif
+    return spacing;
 }
 
 
 /**
- * Space between two words.
- *
- * Ruby usage:
- *   - @verbatim Draw#interword_spacing= @endverbatim
- *
- * Notes:
- *   - New for ImageMagick 6.4.8-0
+ * Set spacing between two words.
  *
- * @param self this object
- * @param spacing the spacing
- * @return self
+ * @param spacing [Float] the spacing
+ * @return [Float] the given spacing
  */
 VALUE
 Draw_interword_spacing_eq(VALUE self, VALUE spacing)
 {
-#if defined(HAVE_ST_INTERWORD_SPACING)
     Draw *draw;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->interword_spacing = NUM2DBL(spacing);
-    return self;
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    self = self;
-    spacing = spacing;
-#endif
+    return spacing;
 }
 
 
@@ -497,24 +404,27 @@ Draw_interword_spacing_eq(VALUE self, VALUE spacing)
 static VALUE
 image_to_str(Image *image)
 {
-    volatile VALUE dimg = Qnil;
-    unsigned char *blob;
-    size_t length;
-    Info *info;
-    ExceptionInfo exception;
+    VALUE dimg = Qnil;
 
     if (image)
     {
+        unsigned char *blob;
+        size_t length;
+        Info *info;
+        ExceptionInfo *exception;
+
         info = CloneImageInfo(NULL);
-        GetExceptionInfo(&exception);
-        blob = ImageToBlob(info, image, &length, &exception);
+        exception = AcquireExceptionInfo();
+        blob = ImageToBlob(info, image, &length, exception);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
-        DestroyExceptionInfo(&exception);
+        DestroyExceptionInfo(exception);
         dimg = rb_str_new((char *)blob, (long)length);
         magick_free((void*)blob);
     }
 
+    RB_GC_GUARD(dimg);
+
     return dimg;
 }
 
@@ -535,17 +445,18 @@ static
 Image *str_to_image(VALUE str)
 {
     Image *image = NULL;
-    Info *info;
-    ExceptionInfo exception;
 
     if (str != Qnil)
     {
+        Info *info;
+        ExceptionInfo *exception;
+
         info = CloneImageInfo(NULL);
-        GetExceptionInfo(&exception);
-        image = BlobToImage(info, RSTRING_PTR(str), RSTRING_LEN(str), &exception);
+        exception = AcquireExceptionInfo();
+        image = BlobToImage(info, RSTRING_PTR(str), RSTRING_LEN(str), exception);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
-        DestroyExceptionInfo(&exception);
+        DestroyExceptionInfo(exception);
     }
 
     return image;
@@ -553,21 +464,16 @@ Image *str_to_image(VALUE str)
 
 
 /**
- * Custom marshal for Draw objects.
+ * Dump custom marshal for Draw objects.
  *
- * Ruby usage:
- *   - @verbatim Draw#marshal_dump @endverbatim
+ * - 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.
  *
- * 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.
- *
- * @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
@@ -592,8 +498,8 @@ Draw_marshal_dump(VALUE self)
     // 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_PixelPacket(&draw->info->fill));
-    rb_hash_aset(ddraw, CSTR2SYM("stroke"), Pixel_from_PixelPacket(&draw->info->stroke));
+    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));
@@ -620,61 +526,54 @@ Draw_marshal_dump(VALUE self)
     rb_hash_aset(ddraw, CSTR2SYM("pointsize"), rb_float_new(draw->info->pointsize));
     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_PixelPacket(&draw->info->undercolor));
-    // rb_hash_aset(ddraw, CSTR2SYM("border_color"), Pixel_from_PixelPacket(&draw->info->border_color)); Montage and Polaroid
+    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));
+#endif
     // 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);
-#if defined(HAVE_ST_KERNING)
     rb_hash_aset(ddraw, CSTR2SYM("kerning"), rb_float_new(draw->info->kerning));
-#endif
-#if defined(HAVE_ST_INTERWORD_SPACING)
     rb_hash_aset(ddraw, CSTR2SYM("interword_spacing"), rb_float_new(draw->info->interword_spacing));
-#endif
 
     // Non-DrawInfo fields
     rb_hash_aset(ddraw, CSTR2SYM("primitives"), draw->primitives);
-    // rb_hash_aset(ddraw, CSTR2SYM("shadow_color"), Pixel_from_PixelPacket(&draw->shadow_color)); Polaroid-only
+    // rb_hash_aset(ddraw, CSTR2SYM("shadow_color"), Pixel_from_PixelColor(&draw->shadow_color)); Polaroid-only
 
     return ddraw;
 }
 
 
 /**
- * Support Marsal.load.
+ * Load the marshalled object
  *
- * Ruby usage:
- *   - @verbatim Draw#marshal_load @endverbatim
- *
- * Notes:
- *   - On entry all fields are all-bits-0
- *
- * @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)
 {
     Draw *draw;
-    Pixel *pixel;
-    volatile VALUE val;
+    VALUE val;
 
     Data_Get_Struct(self, Draw, draw);
-
-    draw->info = magick_malloc(sizeof(DrawInfo));
-    if (!draw->info)
+    
+    if (draw->info == NULL)
     {
-        rb_raise(rb_eNoMemError, "not enough memory to continue");
-    }
-    GetDrawInfo(NULL, draw->info);
+        ImageInfo *image_info;
 
+        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("viewbox"));
@@ -686,12 +585,10 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     draw->info->gravity = (GravityType) FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("gravity")));
 
     val = rb_hash_aref(ddraw, CSTR2SYM("fill"));
-    Data_Get_Struct(val, Pixel, pixel);
-    draw->info->fill =  *pixel;
+    Color_to_PixelColor(&draw->info->fill, val);
 
     val = rb_hash_aref(ddraw, CSTR2SYM("stroke"));
-    Data_Get_Struct(val, Pixel, pixel);
-    draw->info->stroke = *pixel;
+    Color_to_PixelColor(&draw->info->stroke, val);
 
     draw->info->stroke_width = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("stroke_width")));
     draw->info->fill_pattern = str_to_image(rb_hash_aref(ddraw, CSTR2SYM("fill_pattern")));
@@ -711,33 +608,30 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     draw->info->align = (AlignType) FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("align")));
 
     val = rb_hash_aref(ddraw, CSTR2SYM("undercolor"));
-    Data_Get_Struct(val, Pixel, pixel);
-    draw->info->undercolor = *pixel;
+    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")));
-#if defined(HAVE_ST_KERNING)
-    draw->info->kerning = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("kerning")));
 #endif
-#if defined(HAVE_ST_INTERWORD_SPACING)
+    draw->info->kerning = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("kerning")));
     draw->info->interword_spacing = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("interword_spacing")));
-#endif
 
     draw->primitives = rb_hash_aref(ddraw, CSTR2SYM("primitives"));
 
+    RB_GC_GUARD(val);
+
     return self;
 }
 
 
 /**
- * Pointsize attribute writer.
+ * Set point size to draw text.
  *
- * Ruby usage:
- *   - @verbatim Draw#pointsize= @endverbatim
- *
- * @param self this object
- * @param pointsize the pointsize
- * @return self
+ * @param pointsize [Float] the pointsize
+ * @return [Float] the given pointsize
  */
 VALUE
 Draw_pointsize_eq(VALUE self, VALUE pointsize)
@@ -747,24 +641,15 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->pointsize = NUM2DBL(pointsize);
-    return self;
+    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 self
+ * @param deg [Float] the number of degrees
+ * @return [Float] the given degrees
  */
 VALUE
 Draw_rotation_eq(VALUE self, VALUE deg)
@@ -779,39 +664,30 @@ Draw_rotation_eq(VALUE self, VALUE deg)
     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 self;
+    return deg;
 }
 
 
 /**
- * Stroke attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#stroke= @endverbatim
+ * Set stroke.
  *
- * @param self this object
- * @param stroke the stroke
- * @return self
+ * @param stroke [Magick::Pixel, String] the stroke
+ * @return [Magick::Pixel, String] the given stroke
  */
 VALUE
 Draw_stroke_eq(VALUE self, VALUE stroke)
@@ -820,27 +696,23 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->stroke, stroke);
-    return self;
+    Color_to_PixelColor(&draw->info->stroke, stroke);
+    return stroke;
 }
 
 
 /**
  * Accept an image as a stroke pattern.
  *
- * Ruby usage:
- *   - @verbatim Draw#stroke_pattern= @endverbatim
- *
- * @param self this object
- * @param pattern the pattern
- * @return self
- * @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);
@@ -854,6 +726,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);
@@ -861,19 +735,15 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
         draw->info->stroke_pattern = rm_clone_image(image);
     }
 
-    return self;
+    return 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 self
+ * @param stroke_width [Float] the stroke width
+ * @return [Float] the given stroke width
  */
 VALUE
 Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
@@ -883,19 +753,15 @@ Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->stroke_width = NUM2DBL(stroke_width);
-    return self;
+    return stroke_width;
 }
 
 
 /**
- * Text_antialias attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#text_antialias= @endverbatim
+ * Set whether to enable text antialias.
  *
- * @param self this object
- * @param text_antialias the text_antialias
- * @return self
+ * @param text_antialias [Boolean] true if enable text antialias
+ * @return [Boolean] the given value
  */
 VALUE
 Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
@@ -905,19 +771,15 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->text_antialias = (MagickBooleanType) RTEST(text_antialias);
-    return self;
+    return text_antialias;
 }
 
 
 /**
- * Tile attribute writer.
+ * Accept an image as a fill pattern. This is alias of {Draw#fill_pattern=}.
  *
- * Ruby usage:
- *   - @verbatim Draw#tile= @endverbatim
- *
- * @param self this object
- * @param image the image to tile
- * @return self
+ * @param image [Magick::Image] the image to tile
+ * @return [Magick::Image] the given image
  */
 VALUE
 Draw_tile_eq(VALUE self, VALUE image)
@@ -927,14 +789,10 @@ Draw_tile_eq(VALUE self, VALUE image)
 
 
 /**
- * Undercolor attribute writer.
+ * Set undercolor.
  *
- * Ruby usage:
- *   - @verbatim Draw#undercolor= @endverbatim
- *
- * @param self this object
- * @param undercolor the undercolor
- * @return self
+ * @param undercolor [Magick::Pixel, String] the undercolor
+ * @return [Magick::Pixel, String] the given undercolor
  */
 VALUE
 Draw_undercolor_eq(VALUE self, VALUE undercolor)
@@ -943,29 +801,25 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->undercolor, undercolor);
-    return self;
+    Color_to_PixelColor(&draw->info->undercolor, undercolor);
+    return 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,
@@ -981,7 +835,11 @@ VALUE Draw_annotate(
     unsigned long width, height;
     long x, y;
     AffineMatrix keep;
-    char geometry_str[50];
+    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=
@@ -995,13 +853,38 @@ 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);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            // Run the block in self's context
+            rb_obj_instance_eval(0, NULL, self);
+        }
+        else
+        {
+            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");
     }
 
@@ -1014,24 +897,33 @@ 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)
+    AnnotateImage(image, draw->info, exception);
+#else
+    AnnotateImage(image, draw->info);
+#endif
 
     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;
 }
@@ -1040,18 +932,12 @@ 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)
 {
-    volatile VALUE clone;
+    VALUE clone;
 
     clone = Draw_dup(self);
     if (OBJ_FROZEN(self))
@@ -1059,35 +945,44 @@ Draw_clone(VALUE self)
         OBJ_FREEZE(clone);
     }
 
+    RB_GC_GUARD(clone);
+
     return clone;
 }
 
 
 /**
- * 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)
 {
     Draw *draw;
-    const char *op = "Over";
+    const char *op;
     double x, y, width, height;
-    CompositeOperator cop = OverCompositeOp;
-    volatile VALUE image;
+    CompositeOperator cop;
+    VALUE image;
     Image *comp_img;
     struct TmpFile_Name *tmpfile_name;
     char name[MaxTextExtent];
@@ -1101,243 +996,46 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
 
     // Retrieve the image to composite
     image = rm_cur_image(argv[4]);
-    (void) rm_check_destroyed(image);
+    comp_img = rm_check_destroyed(image);
 
     x = NUM2DBL(argv[0]);
     y = NUM2DBL(argv[1]);
     width  = NUM2DBL(argv[2]);
     height = NUM2DBL(argv[3]);
 
-    // The default composition operator is "Over".
+    cop = OverCompositeOp;
     if (argc == 6)
     {
         VALUE_TO_ENUM(argv[5], cop, CompositeOperator);
+    }
 
-        switch (cop)
-        {
-            case AddCompositeOp:
-                op = "Add";
-                break;
-            case AtopCompositeOp:
-                op = "Atop";
-                break;
-            case BlendCompositeOp:
-                op = "Blend";
-                break;
-#if defined(HAVE_ENUM_BLURCOMPOSITEOP)
-            case BlurCompositeOp:
-                op = "Blur";
-                break;
-#endif
-            case BumpmapCompositeOp:
-                op = "Bumpmap";
-                break;
-            case ChangeMaskCompositeOp:
-                op = "ChangeMask";
-                break;
-            case ClearCompositeOp:
-                op = "Clear";
-                break;
-            case ColorBurnCompositeOp:
-                op = "ColorBurn";
-                break;
-            case ColorDodgeCompositeOp:
-                op = "ColorDodge";
-                break;
-            case ColorizeCompositeOp:
-                op = "Colorize";
-                break;
-            case CopyCompositeOp:
-                op = "Copy";
-                break;
-            case CopyBlackCompositeOp:
-                op = "CopyBlack";
-                break;
-            case CopyBlueCompositeOp:
-                op = "CopyBlue";
-                break;
-            case CopyCyanCompositeOp:
-                op = "CopyCyan";
-                break;
-            case CopyGreenCompositeOp:
-                op = "CopyGreen";
-                break;
-            case CopyMagentaCompositeOp:
-                op = "CopyMagenta";
-                break;
-            case CopyOpacityCompositeOp:
-                op = "CopyOpacity";
-                break;
-            case CopyRedCompositeOp:
-                op = "CopyRed";
-                break;
-            case CopyYellowCompositeOp:
-                op = "CopyYellow";
-                break;
-            case DarkenCompositeOp:
-                op = "Darken";
-                break;
-#if defined(HAVE_ENUM_DISTORTCOMPOSITEOP)
-            case DistortCompositeOp:
-                op = "Distort";
-                break;
-#endif
-            case DivideCompositeOp:
-                op = "Divide";
-                break;
-            case DstCompositeOp:
-                op = "Dst";
-                break;
-            case DstAtopCompositeOp:
-                op = "DstAtop";
-                break;
-            case DstInCompositeOp:
-                op = "DstIn";
-                break;
-            case DstOutCompositeOp:
-                op = "DstOut";
-                break;
-            case DstOverCompositeOp:
-                op = "DstOver";
-                break;
-            case DifferenceCompositeOp:
-                op = "Difference";
-                break;
-            case DisplaceCompositeOp:
-                op = "Displace";
-                break;
-            case DissolveCompositeOp:
-                op = "Dissolve";
-                break;
-            case ExclusionCompositeOp:
-                op = "Exclusion";
-                break;
-            case HardLightCompositeOp:
-                op = "HardLight";
-                break;
-            case HueCompositeOp:
-                op = "Hue";
-                break;
-            case InCompositeOp:
-                op = "In";
-                break;
-            case LightenCompositeOp:
-                op = "Lighten";
-                break;
-#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP)
-            case LinearBurnCompositeOp:
-                op = "LinearBurn";
-                break;
-#endif
-#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP)
-            case LinearDodgeCompositeOp:
-                op = "LinearDodge";
-                break;
-#endif
-            case LinearLightCompositeOp:
-                op = "LinearLight";
-                break;
-            case LuminizeCompositeOp:
-                op = "Luminize";
-                break;
-            case MinusCompositeOp:
-                op = "Minus";
-                break;
-            case ModulateCompositeOp:
-                op = "Modulate";
-                break;
-            case MultiplyCompositeOp:
-                op = "Multiply";
-                break;
-            case OutCompositeOp:
-                op = "Out";
-                break;
-            case OverCompositeOp:
-                op = "Over";
-                break;
-            case OverlayCompositeOp:
-                op = "Overlay";
-                break;
-#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP)
-            case PegtopLightCompositeOp:
-                op = "PegtopLight";
-                break;
-#endif
-#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP)
-            case PinLightCompositeOp:
-                op = "PinLight";
-                break;
-#endif
-            case PlusCompositeOp:
-                op = "Plus";
-                break;
-            case ReplaceCompositeOp:
-                op = "Replace";
-                break;
-            case SaturateCompositeOp:
-                op = "Saturate";
-                break;
-            case ScreenCompositeOp:
-                op = "Screen";
-                break;
-            case SoftLightCompositeOp:
-                op = "SoftLight";
-                break;
-            case SrcCompositeOp:
-                op = "Src";
-                break;
-            case SrcAtopCompositeOp:
-                op = "SrcAtop";
-                break;
-            case SrcInCompositeOp:
-                op = "SrcIn";
-                break;
-            case SrcOutCompositeOp:
-                op = "SrcOut";
-                break;
-            case SrcOverCompositeOp:
-                op = "SrcOver";
-                break;
-            case SubtractCompositeOp:
-                op = "Subtract";
-                break;
-            case ThresholdCompositeOp:
-                op = "Threshold";
-                break;
-#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP)
-            case VividLightCompositeOp:
-                op = "VividLight";
-                break;
-#endif
-            case XorCompositeOp:
-                op = "Xor";
-                break;
-            default:
-                rb_raise(rb_eArgError, "unknown composite operator (%d)", cop);
-                break;
-        }
+    op = CommandOptionToMnemonic(MagickComposeOptions, cop);
+    if (rm_strcasecmp("Unrecognized", op) == 0)
+    {
+        rb_raise(rb_eArgError, "unknown composite operator (%d)", cop);
     }
 
     Data_Get_Struct(self, Draw, draw);
 
     // Create a temp copy of the composite image
-    Data_Get_Struct(image, Image, comp_img);
-    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) sprintf(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);
 
     return self;
 }
@@ -1346,18 +1044,18 @@ 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);
@@ -1369,45 +1067,47 @@ Draw_draw(VALUE self, VALUE image_arg)
     }
 
     // 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();
+    DrawImage(image, draw->info, exception);
+#else
+    DrawImage(image, draw->info);
+#endif
 
     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
- *
- * Notes:
- *   - Constructs a new Draw object, then calls initialize_copy.
+ * - 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)
 {
     Draw *draw;
-    volatile VALUE dup;
+    VALUE dup;
 
     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);
-    }
+    RB_GC_GUARD(dup);
+
     return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
 }
 
@@ -1415,19 +1115,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(
@@ -1442,19 +1142,19 @@ Draw_get_type_metrics(
 /**
  * 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(
@@ -1469,14 +1169,8 @@ Draw_get_multiline_type_metrics(
 /**
  * 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)
 {
@@ -1503,17 +1197,13 @@ 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)
 {
     Draw *draw, *draw_options;
-    volatile VALUE options;
+    VALUE options;
 
     Data_Get_Struct(self, Draw, draw);
 
@@ -1522,6 +1212,8 @@ Draw_initialize(VALUE self)
     draw->info = draw_options->info;
     draw_options->info = NULL;
 
+    RB_GC_GUARD(options);
+
     return self;
 }
 
@@ -1529,12 +1221,8 @@ 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)
@@ -1549,23 +1237,19 @@ 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)
 {
     Draw *draw;
-    volatile VALUE draw_obj;
+    VALUE draw_obj;
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
     draw_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw);
 
+    RB_GC_GUARD(draw_obj);
+
     return draw_obj;
 }
 
@@ -1573,12 +1257,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)
@@ -1632,17 +1312,18 @@ static void
 destroy_Draw(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);
@@ -1670,27 +1351,23 @@ new_DrawOptions(void)
 /**
  * Create a DrawOptions object.
  *
- * Ruby usage:
- *   - @verbatim DrawOptions#allocate @endverbatim
- *   - @verbatim DrawOptions#new @endverbatim
+ * - The DrawOptions class is the same as the Draw class except is has only
+ *   the attribute writer functions
  *
- * Notes:
- *   - 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)
 {
     Draw *draw_options;
-    volatile VALUE draw_options_obj;
+    VALUE draw_options_obj;
 
     draw_options = ALLOC(Draw);
     memset(draw_options, 0, sizeof(Draw));
     draw_options_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw_options);
 
+    RB_GC_GUARD(draw_options_obj);
+
     return draw_options_obj;
 }
 
@@ -1698,11 +1375,7 @@ 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)
@@ -1710,7 +1383,7 @@ DrawOptions_initialize(VALUE self)
     Draw *draw_options;
 
     Data_Get_Struct(self, Draw, draw_options);
-    draw_options->info = magick_malloc(sizeof(DrawInfo));
+    draw_options->info = AcquireDrawInfo();
     if (!draw_options->info)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
@@ -1720,8 +1393,15 @@ DrawOptions_initialize(VALUE self)
 
     if (rb_block_given_p())
     {
-        // Run the block in self's context
-        (void) rb_obj_instance_eval(0, NULL, self);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            // Run the block in self's context
+            rb_obj_instance_eval(0, NULL, self);
+        }
+        else
+        {
+            rb_yield(self);
+        }
     }
 
     return self;
@@ -1729,23 +1409,17 @@ 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
- *
- * Notes:
- *   - Internally a PolaroidOptions object is the same as a Draw object. The
- *     methods are implemented by Draw methods in rmdraw.c.
+ * - 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)
 {
-    volatile VALUE polaroid_obj;
+    VALUE polaroid_obj;
     ImageInfo *image_info;
     Draw *draw;
 
@@ -1754,43 +1428,53 @@ 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);
 
+    RB_GC_GUARD(polaroid_obj);
+
     return polaroid_obj;
 }
 
 
 /**
- * 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)
 {
     Draw *draw;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
     // Default shadow color
     Data_Get_Struct(self, Draw, draw);
 
-    GetExceptionInfo(&exception);
-    (void) QueryColorDatabase("gray75", &draw->shadow_color, &exception);
-    CHECK_EXCEPTION()
-    (void) QueryColorDatabase("#dfdfdf", &draw->info->border_color, &exception);
+    exception = AcquireExceptionInfo();
+    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);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            // Run the block in self's context
+            rb_obj_instance_eval(0, NULL, self);
+        }
+        else
+        {
+            rb_yield(self);
+        }
     }
+
     return self;
 }
 
@@ -1812,42 +1496,36 @@ 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 self
+ * @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)
 {
     Draw *draw;
 
+    rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->shadow_color, shadow);
-    return self;
+    Color_to_PixelColor(&draw->shadow_color, shadow);
+    return shadow;
 }
 
 
 /**
- * Set the border color attribute.
+ * Set the border color.
  *
- * Ruby usage:
- *   - @verbatim PolaroidOptions#border_color= @endverbatim
- *
- * @param self this object
- * @param border the border color
- * @return self
+ * @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)
 {
     Draw *draw;
 
+    rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->border_color, border);
-    return self;
+    Color_to_PixelColor(&draw->info->border_color, border);
+    return border;
 }
 
 
@@ -1863,30 +1541,33 @@ static VALUE
 get_dummy_tm_img(VALUE klass)
 {
 #define DUMMY_IMG_CLASS_VAR "@@_dummy_img_"
-    volatile VALUE dummy_img = 0;
-    Info *info;
-    Image *image;
+    VALUE dummy_img = 0;
 
     if (rb_cvar_defined(klass, rb_intern(DUMMY_IMG_CLASS_VAR)) != Qtrue)
     {
+        Info *info;
+        Image *image;
 
         info = CloneImageInfo(NULL);
         if (!info)
         {
             rb_raise(rb_eNoMemError, "not enough memory to continue");
         }
-        image = AcquireImage(info);
+        image = rm_acquire_image(info);
+        DestroyImageInfo(info);
+
         if (!image)
         {
             rb_raise(rb_eNoMemError, "not enough memory to continue");
         }
-        (void) DestroyImageInfo(info);
         dummy_img = rm_image_new(image);
 
         rb_cv_set(klass, DUMMY_IMG_CLASS_VAR, dummy_img);
     }
     dummy_img = rb_cv_get(klass, DUMMY_IMG_CLASS_VAR);
 
+    RB_GC_GUARD(dummy_img);
+
     return dummy_img;
 }
 
@@ -1914,42 +1595,21 @@ get_type_metrics(
                 VALUE self,
                 get_type_metrics_func_t getter)
 {
-    static char attrs[] = "OPbcdefghiklmnopqrstuwxyz[@#%";
- #define ATTRS_L ((int)(sizeof(attrs)-1))
     Image *image;
     Draw *draw;
-    volatile VALUE t;
+    VALUE t;
     TypeMetric metrics;
     char *text = NULL;
     long text_l;
-    long x;
     unsigned int okay;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     switch (argc)
     {
         case 1:                   // use default image
             text = rm_str2cstr(argv[0], &text_l);
-
-            for (x = 0; x < text_l; x++)
-            {
-                // Ensure text string doesn't refer to image attributes.
-                if (text[x] == '%' && x < text_l-1)
-                {
-                    int y;
-                    char spec = text[x+1];
-
-                    for (y = 0; y < ATTRS_L; y++)
-                    {
-                        if (spec == attrs[y])
-                        {
-                            rb_raise(rb_eArgError,
-                                     "text string contains image attribute reference `%%%c'",
-                                     spec);
-                        }
-                    }
-                }
-            }
-
             Data_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, image);
             break;
         case 2:
@@ -1968,24 +1628,55 @@ get_type_metrics(
     }
 
     Data_Get_Struct(self, Draw, 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");
     }
 
+#if defined(IMAGEMAGICK_7)
+    okay = (*getter)(image, draw->info, &metrics, exception);
+#else
     okay = (*getter)(image, draw->info, &metrics);
+#endif
 
     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);
+
     return Import_TypeMetric(&metrics);
 }