rmagick 4.1.0.rc2 → 4.1.0

data/ext/RMagick/rmdraw.c

@@ -27,14 +27,10 @@ static VALUE get_type_metrics(int, VALUE *, VALUE, get_type_metrics_func_t);
 
 
 /**
- * Set the affine matrix from an Magick::AffineMatrix.
+ * Set the affine matrix from an {Magick::AffineMatrix}.
  *
- * Ruby usage:
- *   - @verbatim Draw#affine= @endverbatim
- *
- * @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)
@@ -49,14 +45,10 @@ Draw_affine_eq(VALUE self, VALUE matrix)
 
 
 /**
- * Set the text alignment.
- *
- * Ruby usage:
- *   - @verbatim Draw#align= @endverbatim
+ * Set the text alignment from an {Magick::AlignType}.
  *
- * @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)
@@ -71,14 +63,10 @@ Draw_align_eq(VALUE self, VALUE 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)
@@ -93,14 +81,10 @@ Draw_decorate_eq(VALUE self, VALUE 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)
@@ -109,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 density;
 }
 
 
 /**
- * Encoding attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#encoding= @endverbatim
+ * Set text encoding.
  *
- * @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)
@@ -132,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 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)
@@ -163,20 +139,16 @@ 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);
@@ -190,6 +162,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
@@ -201,14 +175,10 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
 
 
 /**
- * Font attribute writer.
+ * Set the font name.
  *
- * Ruby usage:
- *   - @verbatim Draw#font= @endverbatim
- *
- * @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)
@@ -217,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 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 family
+ * @param family [String] the font family name
+ * @return [String] the given family name
  */
 VALUE
 Draw_font_family_eq(VALUE self, VALUE family)
@@ -240,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 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 stretch
+ * @param stretch [Magick::StretchType] the stretch type
+ * @return [Magick::StretchType] the given stretch type
  */
 VALUE
 Draw_font_stretch_eq(VALUE self, VALUE stretch)
@@ -269,14 +231,10 @@ Draw_font_stretch_eq(VALUE self, VALUE 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 style
+ * @param style [Magick::StyleType] the font style
+ * @return [Magick::StyleType] the given font style
  */
 VALUE
 Draw_font_style_eq(VALUE self, VALUE style)
@@ -291,18 +249,11 @@ Draw_font_style_eq(VALUE self, VALUE 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 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)
@@ -318,7 +269,7 @@ Draw_font_weight_eq(VALUE self, VALUE 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;
     }
@@ -355,27 +306,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)
@@ -391,17 +336,10 @@ Draw_gravity_eq(VALUE self, VALUE 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 kerning
+ * @param kerning [Float] the kerning
+ * @return [Float] the given kerning
  */
 VALUE
 Draw_kerning_eq(VALUE self, VALUE kerning)
@@ -416,17 +354,10 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
 
 
 /**
- * Space between two lines.
- *
- * Ruby usage:
- *   - @verbatim Draw#interline_spacing= @endverbatim
+ * Set spacing between two lines.
  *
- * Notes:
- *   - New for ImageMagick 6.5.5-8
- *
- * @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)
@@ -441,17 +372,10 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
 
 
 /**
- * Space between two words.
+ * Set spacing between two words.
  *
- * Ruby usage:
- *   - @verbatim Draw#interword_spacing= @endverbatim
- *
- * 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)
@@ -481,13 +405,14 @@ 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);
@@ -520,11 +445,12 @@ 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);
@@ -538,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
@@ -632,17 +553,10 @@ Draw_marshal_dump(VALUE self)
 
 
 /**
- * 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)
@@ -651,7 +565,15 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     VALUE val;
 
     Data_Get_Struct(self, Draw, draw);
+    
+    if (draw->info == NULL)
+    {
+        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"));
@@ -706,14 +628,10 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
 
 
 /**
- * Pointsize attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#pointsize= @endverbatim
+ * Set point size to draw text.
  *
- * @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)
@@ -728,19 +646,10 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
 
 
 /**
- * Set rotation attribute value.
- *
- * Ruby usage:
- *   - @verbatim Magick::Draw#rotation= @endverbatim
- *
- * Notes:
- *   - Argument should be in degrees
- *   - Taken from Magick++'s Magick::Image::annotate method.
- *     Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002
+ * Set rotation. The argument should be in degrees.
  *
- * @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)
@@ -755,24 +664,19 @@ 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 deg;
@@ -780,14 +684,10 @@ Draw_rotation_eq(VALUE self, VALUE deg)
 
 
 /**
- * Stroke attribute writer.
- *
- * Ruby usage:
- *   - @verbatim Draw#stroke= @endverbatim
+ * Set stroke.
  *
- * @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)
@@ -804,19 +704,15 @@ 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);
@@ -830,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);
@@ -842,14 +740,10 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
 
 
 /**
- * Stroke_width attribute writer.
+ * Set stroke width.
  *
- * Ruby usage:
- *   - @verbatim Draw#stroke_width= @endverbatim
- *
- * @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)
@@ -864,14 +758,10 @@ Draw_stroke_width_eq(VALUE self, VALUE 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)
@@ -886,14 +776,10 @@ Draw_text_antialias_eq(VALUE self, VALUE 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)
@@ -903,14 +789,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)
@@ -927,21 +809,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,
@@ -958,6 +836,7 @@ VALUE Draw_annotate(
     long x, y;
     AffineMatrix keep;
     char geometry_str[100];
+    char *embed_text;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
@@ -974,13 +853,14 @@ 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_obj_instance_eval(0, NULL, self);
     }
 
     // Translate & store in Draw structure
+    embed_text = StringValueCStr(text);
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    draw->info->text = InterpretImageProperties(NULL, image, StringValuePtr(text), exception);
+    draw->info->text = InterpretImageProperties(NULL, image, embed_text, exception);
     if (rm_should_raise_exception(exception, RetainExceptionRetention))
     {
         if (draw->info->text)
@@ -990,12 +870,12 @@ VALUE Draw_annotate(
         rm_raise_exception(exception);
     }
 #else
-    draw->info->text = InterpretImageProperties(NULL, image, StringValuePtr(text));
+    draw->info->text = InterpretImageProperties(NULL, image, embed_text);
 #endif
     if (!draw->info->text)
     {
 #if defined(IMAGEMAGICK_7)
-        (void) DestroyExceptionInfo(exception);
+        DestroyExceptionInfo(exception);
 #endif
         rb_raise(rb_eArgError, "no text");
     }
@@ -1009,21 +889,21 @@ 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);
 
 #if defined(IMAGEMAGICK_7)
-    (void) AnnotateImage(image, draw->info, exception);
+    AnnotateImage(image, draw->info, exception);
 #else
-    (void) AnnotateImage(image, draw->info);
+    AnnotateImage(image, draw->info);
 #endif
 
     magick_free(draw->info->text);
@@ -1031,8 +911,8 @@ VALUE Draw_annotate(
     draw->info->affine = keep;
 
 #if defined(IMAGEMAGICK_7)
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 #else
     rm_check_image_exception(image, RetainOnError);
 #endif
@@ -1044,13 +924,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)
@@ -1070,21 +944,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)
@@ -1129,22 +1010,22 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(self, Draw, 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);
 
@@ -1155,12 +1036,9 @@ 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)
@@ -1181,21 +1059,21 @@ 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));
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    (void) DrawImage(image, draw->info, exception);
+    DrawImage(image, draw->info, exception);
 #else
-    (void) DrawImage(image, draw->info);
+    DrawImage(image, draw->info);
 #endif
 
     magick_free(draw->info->primitive);
     draw->info->primitive = NULL;
 
 #if defined(IMAGEMAGICK_7)
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 #else
     rm_check_image_exception(image, RetainOnError);
 #endif
@@ -1205,18 +1083,11 @@ Draw_draw(VALUE self, VALUE image_arg)
 
 
 /**
- * Copy a Draw object.
- *
- * Ruby usage:
- *   - @verbatim Draw#dup @endverbatim
+ * Duplicate a Draw object.
  *
- * 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)
@@ -1227,11 +1098,6 @@ 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);
-    }
-
     RB_GC_GUARD(dup);
 
     return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
@@ -1241,19 +1107,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(
@@ -1268,19 +1134,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(
@@ -1295,14 +1161,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)
 {
@@ -1329,11 +1189,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)
@@ -1357,12 +1213,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)
@@ -1377,13 +1229,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)
 {
@@ -1403,12 +1249,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)
@@ -1462,17 +1304,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);
@@ -1500,16 +1343,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)
@@ -1530,11 +1367,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)
@@ -1553,7 +1386,7 @@ DrawOptions_initialize(VALUE self)
     if (rb_block_given_p())
     {
         // Run the block in self's context
-        (void) rb_obj_instance_eval(0, NULL, self);
+        rb_obj_instance_eval(0, NULL, self);
     }
 
     return self;
@@ -1561,18 +1394,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)
@@ -1586,8 +1413,8 @@ 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);
 
@@ -1598,13 +1425,11 @@ PolaroidOptions_alloc(VALUE class)
 
 
 /**
- * Yield to an optional block.
+ * Initialize a PolaroidOptions object.
  *
- * Ruby usage:
- *   - @verbatim Magick::PolaroidOptions#initialize @endverbatim
- *
- * @param self this object
- * @return self
+ * @yield [self]
+ * @yieldparam self [Magick::Image::PolaroidOptions] self
+ * @return [Magick::Image::PolaroidOptions] self
  */
 VALUE
 PolaroidOptions_initialize(VALUE self)
@@ -1616,16 +1441,16 @@ PolaroidOptions_initialize(VALUE self)
     Data_Get_Struct(self, Draw, 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_obj_instance_eval(0, NULL, self);
     }
     return self;
 }
@@ -1648,12 +1473,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)
@@ -1668,14 +1489,10 @@ PolaroidOptions_shadow_color_eq(VALUE self, VALUE 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 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)
@@ -1702,11 +1519,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)
@@ -1714,7 +1531,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)
         {
@@ -1805,7 +1622,7 @@ get_type_metrics(
     if (!draw->info->text)
     {
 #if defined(IMAGEMAGICK_7)
-        (void) DestroyExceptionInfo(exception);
+        DestroyExceptionInfo(exception);
 #endif
         rb_raise(rb_eArgError, "no text to measure");
     }
@@ -1822,8 +1639,8 @@ get_type_metrics(
     if (!okay)
     {
 #if defined(IMAGEMAGICK_7)
-        CHECK_EXCEPTION()
-        (void) DestroyExceptionInfo(exception);
+        CHECK_EXCEPTION();
+        DestroyExceptionInfo(exception);
 #else
         rm_check_image_exception(image, RetainOnError);
 #endif
@@ -1833,7 +1650,7 @@ get_type_metrics(
                  "Is the FreeType library installed?");
     }
 #if defined(IMAGEMAGICK_7)
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #endif
 
     RB_GC_GUARD(t);