rmagick 3.1.0 → 3.2.0

data/ext/RMagick/rmdraw.c

@@ -30,7 +30,7 @@ static VALUE get_type_metrics(int, VALUE *, VALUE, get_type_metrics_func_t);
  *
  * @param self this object
  * @param matrix the affine matrix to set
- * @return self
+ * @return matrix
  */
 VALUE
 Draw_affine_eq(VALUE self, VALUE matrix)
@@ -40,7 +40,7 @@ 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;
 }
 
 
@@ -52,7 +52,7 @@ Draw_affine_eq(VALUE self, VALUE matrix)
  *
  * @param self this object
  * @param align the alignment
- * @return self
+ * @return align
  */
 VALUE
 Draw_align_eq(VALUE self, VALUE align)
@@ -62,7 +62,7 @@ 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;
 }
 
 
@@ -74,7 +74,7 @@ Draw_align_eq(VALUE self, VALUE align)
  *
  * @param self this object
  * @param decorate the decorate
- * @return self
+ * @return decorate
  */
 VALUE
 Draw_decorate_eq(VALUE self, VALUE decorate)
@@ -84,7 +84,7 @@ 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;
 }
 
 
@@ -96,7 +96,7 @@ Draw_decorate_eq(VALUE self, VALUE decorate)
  *
  * @param self this object
  * @param density the density
- * @return self
+ * @return density
  */
 VALUE
 Draw_density_eq(VALUE self, VALUE density)
@@ -107,7 +107,7 @@ Draw_density_eq(VALUE self, VALUE density)
     Data_Get_Struct(self, Draw, draw);
     magick_clone_string(&draw->info->density, StringValuePtr(density));
 
-    return self;
+    return density;
 }
 
 
@@ -119,7 +119,7 @@ Draw_density_eq(VALUE self, VALUE density)
  *
  * @param self this object
  * @param encoding the encoding
- * @return self
+ * @return encoding
  */
 VALUE
 Draw_encoding_eq(VALUE self, VALUE encoding)
@@ -130,7 +130,7 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
     Data_Get_Struct(self, Draw, draw);
     magick_clone_string(&draw->info->encoding, StringValuePtr(encoding));
 
-    return self;
+    return encoding;
 }
 
 
@@ -142,7 +142,7 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
  *
  * @param self this object
  * @param fill the fill
- * @return self
+ * @return fill
  */
 VALUE
 Draw_fill_eq(VALUE self, VALUE fill)
@@ -152,7 +152,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     Color_to_PixelColor(&draw->info->fill, fill);
-    return self;
+    return fill;
 }
 
 
@@ -164,7 +164,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
  *
  * @param self this object
  * @param pattern the fill pattern
- * @return self
+ * @return pattern
  * @see Draw_stroke_pattern_eq
  * @see Draw_tile_eq
  */
@@ -192,7 +192,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
         draw->info->fill_pattern = rm_clone_image(image);
     }
 
-    return self;
+    return pattern;
 }
 
 
@@ -204,7 +204,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
  *
  * @param self this object
  * @param font the font
- * @return self
+ * @return font
  */
 VALUE
 Draw_font_eq(VALUE self, VALUE font)
@@ -215,7 +215,7 @@ Draw_font_eq(VALUE self, VALUE font)
     Data_Get_Struct(self, Draw, draw);
     magick_clone_string(&draw->info->font, StringValuePtr(font));
 
-    return self;
+    return font;
 }
 
 
@@ -227,7 +227,7 @@ Draw_font_eq(VALUE self, VALUE font)
  *
  * @param self this object
  * @param family the family
- * @return self
+ * @return family
  */
 VALUE
 Draw_font_family_eq(VALUE self, VALUE family)
@@ -238,7 +238,7 @@ Draw_font_family_eq(VALUE self, VALUE family)
     Data_Get_Struct(self, Draw, draw);
     magick_clone_string(&draw->info->family, StringValuePtr(family));
 
-    return self;
+    return family;
 }
 
 
@@ -250,7 +250,7 @@ Draw_font_family_eq(VALUE self, VALUE family)
  *
  * @param self this object
  * @param stretch the font_stretch
- * @return self
+ * @return stretch
  */
 VALUE
 Draw_font_stretch_eq(VALUE self, VALUE stretch)
@@ -260,7 +260,7 @@ 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;
 }
 
 
@@ -272,7 +272,7 @@ Draw_font_stretch_eq(VALUE self, VALUE stretch)
  *
  * @param self this object
  * @param style the font_style
- * @return self
+ * @return style
  */
 VALUE
 Draw_font_style_eq(VALUE self, VALUE style)
@@ -282,7 +282,7 @@ 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;
 }
 
 
@@ -298,7 +298,7 @@ Draw_font_style_eq(VALUE self, VALUE style)
  *
  * @param self this object
  * @param weight the font_weight
- * @return self
+ * @return weight
  */
 VALUE
 Draw_font_weight_eq(VALUE self, VALUE weight)
@@ -346,7 +346,7 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
         }
     }
 
-    return self;
+    return weight;
 }
 
 
@@ -371,7 +371,7 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
  *
  * @param self this object
  * @param grav the gravity
- * @return self
+ * @return grav
  */
 VALUE
 Draw_gravity_eq(VALUE self, VALUE grav)
@@ -382,7 +382,7 @@ 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;
 }
 
 
@@ -397,7 +397,7 @@ Draw_gravity_eq(VALUE self, VALUE grav)
  *
  * @param self this object
  * @param kerning the kerning
- * @return self
+ * @return kerning
  */
 VALUE
 Draw_kerning_eq(VALUE self, VALUE kerning)
@@ -407,7 +407,7 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->kerning = NUM2DBL(kerning);
-    return self;
+    return kerning;
 }
 
 
@@ -422,7 +422,7 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
  *
  * @param self this object
  * @param spacing the spacing
- * @return self
+ * @return spacing
  */
 VALUE
 Draw_interline_spacing_eq(VALUE self, VALUE spacing)
@@ -432,7 +432,7 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->interline_spacing = NUM2DBL(spacing);
-    return self;
+    return spacing;
 }
 
 
@@ -447,7 +447,7 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
  *
  * @param self this object
  * @param spacing the spacing
- * @return self
+ * @return spacing
  */
 VALUE
 Draw_interword_spacing_eq(VALUE self, VALUE spacing)
@@ -457,7 +457,7 @@ Draw_interword_spacing_eq(VALUE self, VALUE spacing)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->interword_spacing = NUM2DBL(spacing);
-    return self;
+    return spacing;
 }
 
 
@@ -701,7 +701,7 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
  *
  * @param self this object
  * @param pointsize the pointsize
- * @return self
+ * @return pointsize
  */
 VALUE
 Draw_pointsize_eq(VALUE self, VALUE pointsize)
@@ -711,7 +711,7 @@ 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;
 }
 
 
@@ -728,7 +728,7 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
  *
  * @param self this object
  * @param deg the number of degrees
- * @return self
+ * @return deg
  */
 VALUE
 Draw_rotation_eq(VALUE self, VALUE deg)
@@ -763,7 +763,7 @@ Draw_rotation_eq(VALUE self, VALUE deg)
         draw->info->affine.tx=current.sx*affine.tx+current.ry*affine.ty+current.tx;
     }
 
-    return self;
+    return deg;
 }
 
 
@@ -775,7 +775,7 @@ Draw_rotation_eq(VALUE self, VALUE deg)
  *
  * @param self this object
  * @param stroke the stroke
- * @return self
+ * @return stroke
  */
 VALUE
 Draw_stroke_eq(VALUE self, VALUE stroke)
@@ -785,7 +785,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     Color_to_PixelColor(&draw->info->stroke, stroke);
-    return self;
+    return stroke;
 }
 
 
@@ -797,7 +797,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
  *
  * @param self this object
  * @param pattern the pattern
- * @return self
+ * @return pattern
  * @see Draw_fill_pattern_eq
  */
 VALUE
@@ -825,7 +825,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
         draw->info->stroke_pattern = rm_clone_image(image);
     }
 
-    return self;
+    return pattern;
 }
 
 
@@ -837,7 +837,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
  *
  * @param self this object
  * @param stroke_width the stroke_width
- * @return self
+ * @return stroke_width
  */
 VALUE
 Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
@@ -847,7 +847,7 @@ 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;
 }
 
 
@@ -859,7 +859,7 @@ Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
  *
  * @param self this object
  * @param text_antialias the text_antialias
- * @return self
+ * @return text_antialias
  */
 VALUE
 Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
@@ -869,7 +869,7 @@ 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;
 }
 
 
@@ -881,7 +881,7 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
  *
  * @param self this object
  * @param image the image to tile
- * @return self
+ * @return image
  */
 VALUE
 Draw_tile_eq(VALUE self, VALUE image)
@@ -898,7 +898,7 @@ Draw_tile_eq(VALUE self, VALUE image)
  *
  * @param self this object
  * @param undercolor the undercolor
- * @return self
+ * @return undercolor
  */
 VALUE
 Draw_undercolor_eq(VALUE self, VALUE undercolor)
@@ -908,7 +908,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     Color_to_PixelColor(&draw->info->undercolor, undercolor);
-    return self;
+    return undercolor;
 }
 
 
@@ -945,7 +945,7 @@ VALUE Draw_annotate(
     unsigned long width, height;
     long x, y;
     AffineMatrix keep;
-    char geometry_str[50];
+    char geometry_str[100];
 
     // Save the affine matrix in case it is modified by
     // Draw#rotation=
@@ -1050,9 +1050,9 @@ 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;
+    CompositeOperator cop;
     VALUE image;
     Image *comp_img;
     struct TmpFile_Name *tmpfile_name;
@@ -1067,239 +1067,28 @@ 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;
-            case BlurCompositeOp:
-                op = "Blur";
-                break;
-            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 CopyBlackCompositeOp:
-                op = "CopyBlack";
-                break;
-            case CopyBlueCompositeOp:
-                op = "CopyBlue";
-                break;
-            case CopyCompositeOp:
-                op = "Copy";
-                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;
-            case DarkenIntensityCompositeOp:
-                op = "DarkenIntensity";
-                break;
-            case DistortCompositeOp:
-                op = "Distort";
-                break;
-            case DivideCompositeOp:
-                op = "Divide";
-                break;
-            case DivideSrcCompositeOp:
-                op = "DivideSrc";
-                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;
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
-            case HardMixCompositeOp:
-                op = "HardMix";
-                break;
-#endif
-            case HueCompositeOp:
-                op = "Hue";
-                break;
-            case InCompositeOp:
-                op = "In";
-                break;
-            case LightenCompositeOp:
-                op = "Lighten";
-                break;
-            case LightenIntensityCompositeOp:
-                op = "LightenIntensity";
-                break;
-            case LinearBurnCompositeOp:
-                op = "LinearBurn";
-                break;
-            case LinearDodgeCompositeOp:
-                op = "LinearDodge";
-                break;
-            case LinearLightCompositeOp:
-                op = "LinearLight";
-                break;
-            case LuminizeCompositeOp:
-                op = "Luminize";
-                break;
-            case MathematicsCompositeOp:
-                op = "Mathematics";
-                break;
-            case MinusCompositeOp:
-                op = "Minus";
-                break;
-            case MinusSrcCompositeOp:
-                op = "MinusSrc";
-                break;
-            case ModulateCompositeOp:
-                op = "Modulate";
-                break;
-            case MultiplyCompositeOp:
-                op = "Multiply";
-                break;
-            case NoCompositeOp:
-                op = "No";
-                break;
-            case OutCompositeOp:
-                op = "Out";
-                break;
-            case OverCompositeOp:
-                op = "Over";
-                break;
-            case OverlayCompositeOp:
-                op = "Overlay";
-                break;
-            case PegtopLightCompositeOp:
-                op = "PegtopLight";
-                break;
-            case PinLightCompositeOp:
-                op = "PinLight";
-                break;
-            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;
-            case UndefinedCompositeOp:
-                op = "Undefined";
-                break;
-            case VividLightCompositeOp:
-                op = "VividLight";
-                break;
-            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);
 
     // Add the temp filename to the filename array.
@@ -1311,7 +1100,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     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);
+    (void) snprintf(primitive, sizeof(primitive), "image %s %g,%g,%g,%g '%s'", op, x, y, width, height, name);
 
 
     // Send "primitive" to self.
@@ -1810,7 +1599,7 @@ rm_polaroid_new(void)
  *
  * @param self this object
  * @param shadow the shadow color
- * @return self
+ * @return shadow
  */
 VALUE
 PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
@@ -1820,7 +1609,7 @@ PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     Color_to_PixelColor(&draw->shadow_color, shadow);
-    return self;
+    return shadow;
 }
 
 
@@ -1832,7 +1621,7 @@ PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
  *
  * @param self this object
  * @param border the border color
- * @return self
+ * @return border
  */
 VALUE
 PolaroidOptions_border_color_eq(VALUE self, VALUE border)
@@ -1842,7 +1631,7 @@ PolaroidOptions_border_color_eq(VALUE self, VALUE border)
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     Color_to_PixelColor(&draw->info->border_color, border);
-    return self;
+    return border;
 }
 
 
@@ -1918,7 +1707,6 @@ get_type_metrics(
     TypeMetric metrics;
     char *text = NULL;
     long text_l;
-    long x;
     unsigned int okay;
 
     switch (argc)