magickwand 0.1.0 → 0.2.0

data/ext/magickwand/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-MAGICKWAND_VERSION = "0.1.0"
+MAGICKWAND_VERSION = "0.2.0"
 MIN_IM_VERS = "6.5.0"
 MIN_IM_VERS_NO = MIN_IM_VERS.tr(".","").to_i
 
@@ -50,7 +50,8 @@ unless have_library("MagickWand", "MagickWandGenesis", headers)
 end
 
 # ImageMagick features                                Release added
-["MagickSetColorspace",                               # 6.5.1
+["DrawSetBorderColor",                                # 6.5.4
+ "MagickSetColorspace",                               # 6.5.1
  "MagickSetImageFuzz"                                 # 6.5.1
 ].each do |func|
     have_func(func, headers)

data/ext/magickwand/magickwand.c

@@ -1,6 +1,6 @@
 /*
  *  magickwand.c
- *  $Id: magickwand.c 146 2009-05-31 22:00:57Z rmagick $
+ *  $Id: magickwand.c 164 2009-06-21 16:52:27Z rmagick $
  *  Copyright (C) 2009 Timothy Paul Hunter
  */
 
@@ -145,7 +145,7 @@ void Init_magickwand(void)
     ImageMagick_config();
 
     mwr_init_Wand();
-    mwr_init_GC();
+    mwr_init_Drawing();
     mwr_init_ImageMagickError();
     mwr_init_FatalImageMagickError();
 

data/ext/magickwand/magickwand.h

@@ -1,6 +1,6 @@
 /*
  *  magickwand.h
- *  $Id: magickwand.h 25 2009-04-28 23:11:33Z rmagick $
+ *  $Id: magickwand.h 285 2009-08-14 23:09:24Z rmagick $
  *  Copyright (C) 2009 Timothy Paul Hunter
  */
 
@@ -32,8 +32,8 @@ typedef struct
 
 typedef struct
 {
-    DrawingWand *drawingwand;
-} GC;
+    DrawingWand *wand;
+} Drawing;
 
 
 // What to do when an option value is not in the list of defined option values
@@ -48,7 +48,7 @@ typedef enum {
  */
 VALUE mwr_mMagickWand;
 VALUE mwr_cWand;
-VALUE mwr_cGC;
+VALUE mwr_cDrawing;
 VALUE mwr_eImageMagickError;
 VALUE mwr_eFatalImageMagickError;
 
@@ -56,7 +56,7 @@ VALUE mwr_eFatalImageMagickError;
 /*
  *  Extern functions
  */
-extern void mwr_init_GC(void);
+extern void mwr_init_Drawing(void);
 extern void mwr_init_Wand(void);
 extern void mwr_init_ImageMagickError(void);
 extern void mwr_init_FatalImageMagickError(void);
@@ -67,18 +67,24 @@ extern void mwr_check_error(ExceptionInfo *);
 extern MagickBooleanType mwr_get_option(VALUE, const char *, VALUE *);
 extern char *mwr_imagetype_to_s(ImageType);
 extern VALUE mwr_pixelpacket_to_hex(Image *, PixelPacket *);
+extern VALUE mwr_pixelwand_to_hex(Image *, PixelWand *);
 extern void mwr_option_value_error(const char *, const char *);
 extern VALUE mwr_option_values_to_hash(char *);
 extern AlignType mwr_string_to_aligntype(VALUE, AlignType, OnUndefinedOption);
 extern ChannelType mwr_string_to_channeltype(VALUE, ChannelType, OnUndefinedOption);
+extern ClipPathUnits mwr_string_to_clip_units(VALUE, ClipPathUnits, OnUndefinedOption);
 extern ColorspaceType mwr_string_to_colorspacetype(VALUE, ColorspaceType, OnUndefinedOption);
 extern CompositeOperator mwr_string_to_composetype(VALUE, CompositeOperator, OnUndefinedOption);
 extern CompressionType mwr_string_to_compressiontype(VALUE, CompressionType, OnUndefinedOption);
 extern DecorationType mwr_string_to_decorationtype(VALUE, DecorationType, OnUndefinedOption);
+extern FillRule mwr_string_to_fillrule(VALUE, FillRule, OnUndefinedOption);
 extern FilterTypes mwr_string_to_filtertypes(VALUE, FilterTypes, OnUndefinedOption);
 extern GravityType mwr_string_to_gravitytype(VALUE, GravityType, OnUndefinedOption);
 extern ImageType mwr_string_to_imagetype(VALUE, ImageType, OnUndefinedOption);
+extern LineCap mwr_string_to_line_cap(VALUE, LineCap, OnUndefinedOption);
+extern LineJoin mwr_string_to_line_join(VALUE, LineJoin, OnUndefinedOption);
 extern MetricType mwr_string_to_metrictype(VALUE, MetricType, OnUndefinedOption);
+extern PaintMethod mwr_string_to_paintmethod(VALUE, PaintMethod, OnUndefinedOption);
 extern StorageType mwr_string_to_storagetype(VALUE, StorageType, OnUndefinedOption);
 extern StretchType mwr_string_to_stretchtype(VALUE, StretchType, OnUndefinedOption);
 extern StyleType mwr_string_to_styletype(VALUE, StyleType, OnUndefinedOption);
@@ -87,5 +93,5 @@ extern char *mwr_format_size(const MagickSizeType, char *);
 extern void mwr_get_pixelpacket_from_pixelwand(PixelPacket *, PixelWand *);
 extern void mwr_get_pixelwand_from_pixelpacket(PixelWand *, PixelPacket *);
 extern void mwr_process_options(VALUE, VALUE);
-extern VALUE mwr_gc_new(void);
+extern VALUE mwr_drawing_new(void);
 #endif

data/ext/magickwand/utility.c

@@ -1,7 +1,7 @@
 
 /*
  *  utility.c
- *  $Id: utility.c 144 2009-05-31 20:51:53Z rmagick $
+ *  $Id: utility.c 285 2009-08-14 23:09:24Z rmagick $
  *  Copyright (C) 2009 Timothy Paul Hunter
  */
 
@@ -38,6 +38,7 @@ static ValueList align_types[] = {
     { "right",  (long) RightAlign  },
     { "start",  (long) LeftAlign   },
     { NULL,     (long) UndefinedAlign } };
+
 static ValueList channel_types[] = {
     { "all",        (long) AllChannels    },
     { "alpha",      (long) OpacityChannel },
@@ -59,6 +60,13 @@ static ValueList channel_types[] = {
     { "saturation", (long) GreenChannel   },
     { "yellow",     (long) YellowChannel  },
     { NULL,         (long) UndefinedChannel} };
+
+static ValueList clip_units[] = {
+    { "objectboundingbox", (long) ObjectBoundingBox },
+    { "userspace",         (long) UserSpace },
+    { "userspaceonuse",    (long) UserSpaceOnUse } };
+
+
 static ValueList colorspace_types[] = {
     { "cmy",         (long) CMYColorspace         },
     { "cmyk",        (long) CMYKColorspace        },
@@ -83,6 +91,7 @@ static ValueList colorspace_types[] = {
     { "ypbpr",       (long) YPbPrColorspace       },
     { "yuv",         (long) YUVColorspace         },
     { NULL,          (long) UndefinedColorspace   } };
+
 static ValueList compose_types[] = {
     {  "add",         (long) AddCompositeOp         },
     {  "atop",        (long) AtopCompositeOp        },
@@ -142,6 +151,7 @@ static ValueList compose_types[] = {
     {  "threshold",   (long) ThresholdCompositeOp   },
     {  "xor",         (long) XorCompositeOp         },
     {  NULL,          (long) UndefinedCompositeOp   } };
+
 static ValueList compression_types[] = {
     { "bzip",             (long) BZipCompression         },
     { "dxt1",             (long) DXT1Compression         },
@@ -159,12 +169,19 @@ static ValueList compression_types[] = {
     { "zip",              (long) ZipCompression          },
     { "runlengthencoded", (long) RLECompression          },
     { NULL,               (long) UndefinedCompression    } };
+
 static ValueList decoration_types[] = {
     { "linethrough", (long) LineThroughDecoration },
     { "none",        (long) NoDecoration          },
     { "overline",    (long) OverlineDecoration    },
     { "underline",   (long) UnderlineDecoration   },
     { NULL,          (long) UndefinedDecoration   } };
+
+static ValueList fill_rules[] = {
+    { "evenodd", (long) EvenOddRule },
+    { "nonzero", (long) NonZeroRule },
+    { NULL,      (long) UndefinedRule } };
+
 static ValueList filter_types[] = {
     {"bartlett",  (long) BartlettFilter},
     {"bessel",    (long) BesselFilter},
@@ -217,6 +234,19 @@ static ValueList gravity_types[] = {
     { "west",      (long) WestGravity      },
     { "static",    (long) StaticGravity    },
     { NULL,        (long) UndefinedGravity } };
+
+static ValueList line_caps[] = {
+    { "butt",   (long) ButtCap },
+    { "round",  (long) RoundCap },
+    { "square", (long) SquareCap },
+    { NULL,     (long) UndefinedCap } };
+
+static ValueList line_joins[] = {
+    { "bevel", (long) BevelJoin },
+    { "miter", (long) MiterJoin },
+    { "round", (long) RoundJoin },
+    { NULL,    (long) UndefinedJoin } };
+
 static ValueList metric_types[] = {
     { "ae",   (long) AbsoluteErrorMetric          },
     { "mae",  (long) MeanAbsoluteErrorMetric      },
@@ -226,6 +256,15 @@ static ValueList metric_types[] = {
     { "psnr", (long) PeakSignalToNoiseRatioMetric },
     { "rmse", (long) RootMeanSquaredErrorMetric   },
     { NULL,   (long) UndefinedMetric              }  };
+
+static ValueList paint_methods[] = {
+    { "filltoborder", (long) FillToBorderMethod },
+    { "floodfill",    (long) FloodfillMethod    },
+    { "point",        (long) PointMethod        },
+    { "replace",      (long) ReplaceMethod      },
+    { "reset",        (long) ResetMethod        },
+    { NULL,           (long) UndefinedMethod    } };
+
 static ValueList storage_types[] = {
     { "char",    (long) CharPixel      },
     { "double",  (long) DoublePixel    },
@@ -235,6 +274,7 @@ static ValueList storage_types[] = {
     { "quantum", (long) QuantumPixel   },
     { "short",   (long) ShortPixel     },
     { NULL,      (long) UndefinedPixel }  };
+
 static ValueList stretch_types[] = {
     { "any",            (long) AnyStretch },
     { "condensed",      (long) CondensedStretch },
@@ -247,12 +287,14 @@ static ValueList stretch_types[] = {
     { "ultracondensed", (long) UltraCondensedStretch },
     { "ultraexpanded",  (long) UltraExpandedStretch },
     { NULL,             (long) UndefinedStretch } };
+
 static ValueList style_types[] = {
-    { "any",      (long) AnyStyle },
+    { "any",     (long) AnyStyle },
     { "italic",  (long) ItalicStyle  },
     { "normal",  (long) NormalStyle  },
     { "oblique", (long) ObliqueStyle },
     { NULL,      (long) UndefinedStyle } };
+
 static ValueList weight_types[] = {
     { "any", 0L },
     { "light", 100L },
@@ -261,21 +303,26 @@ static ValueList weight_types[] = {
     { NULL, 0L } };
 
 static OptionList option_list[] = {
-    {"align",        align_types},
-    {"channel",      channel_types},
-    {"colorspace",   colorspace_types},
-    {"compose",      compose_types},
-    {"compress",     compression_types},
-    {"decoration",   decoration_types},
-    {"filter",       filter_types},
-    {"gravity",      gravity_types},
-    {"metric",       metric_types},
-    {"type",         image_types},
-    {"storage_type", storage_types},
-    {"stretch",      stretch_types},
-    {"style",        style_types},
-    {"weight",       weight_types},
-    {NULL,           NULL} };
+    {"align",           align_types},
+    {"channel",         channel_types},
+    {"clip_units",      clip_units},
+    {"colorspace",      colorspace_types},
+    {"compose",         compose_types},
+    {"compress",        compression_types},
+    {"decoration",      decoration_types},
+    {"fillrule",        fill_rules},
+    {"filter",          filter_types},
+    {"gravity",         gravity_types},
+    {"metric",          metric_types},
+    {"method",          paint_methods},
+    {"type",            image_types},
+    {"storage_type",    storage_types},
+    {"line_cap",        line_caps},
+    {"line_join",       line_joins},
+    {"stretch",         stretch_types},
+    {"style",           style_types},
+    {"weight",          weight_types},
+    {NULL,              NULL} };
 
 
 
@@ -390,6 +437,11 @@ ChannelType mwr_string_to_channeltype(VALUE s, ChannelType defval, OnUndefinedOp
     return (ChannelType) string_to_enum("channel", channel_types, s, (long)defval, undef);
 }
 
+ClipPathUnits mwr_string_to_clip_units(VALUE s, ClipPathUnits defval, OnUndefinedOption undef)
+{
+    return (ClipPathUnits) string_to_enum("clip_units", clip_units, s, (long)defval, undef);
+}
+
 ColorspaceType mwr_string_to_colorspacetype(VALUE s, ColorspaceType defval, OnUndefinedOption undef)
 {
     return (ColorspaceType) string_to_enum("colorspace", colorspace_types, s, (long)defval, undef);
@@ -410,6 +462,11 @@ DecorationType mwr_string_to_decorationtype(VALUE s, DecorationType defval, OnUn
     return (DecorationType) string_to_enum("decoration", decoration_types, s, (long)defval, undef);
 }
 
+FillRule mwr_string_to_fillrule(VALUE s, FillRule defval, OnUndefinedOption undef)
+{
+    return (FillRule) string_to_enum("fillrule", fill_rules, s, (long)defval, undef);
+}
+
 FilterTypes mwr_string_to_filtertypes(VALUE s, FilterTypes defval, OnUndefinedOption undef)
 {
     return (FilterTypes) string_to_enum("filter", filter_types, s, (long)defval, undef);
@@ -425,11 +482,26 @@ ImageType mwr_string_to_imagetype(VALUE s, ImageType defval, OnUndefinedOption u
     return (ImageType) string_to_enum("type", image_types, s, (long)defval, undef);
 }
 
+LineCap mwr_string_to_line_cap(VALUE s, LineCap defval, OnUndefinedOption undef)
+{
+    return (LineCap) string_to_enum("line_cap", line_caps, s, (long)defval, undef);
+}
+
+LineJoin mwr_string_to_line_join(VALUE s, LineJoin defval, OnUndefinedOption undef)
+{
+    return (LineCap) string_to_enum("line_join", line_joins, s, (long)defval, undef);
+}
+
 MetricType mwr_string_to_metrictype(VALUE s, MetricType defval, OnUndefinedOption undef)
 {
     return (MetricType) string_to_enum("type", metric_types, s, (long)defval, undef);
 }
 
+PaintMethod mwr_string_to_paintmethod(VALUE s, PaintMethod defval, OnUndefinedOption undef)
+{
+    return (PaintMethod) string_to_enum("method", paint_methods, s, (long)defval, undef);
+}
+
 StorageType mwr_string_to_storagetype(VALUE s, StorageType defval, OnUndefinedOption undef)
 {
     return (StretchType) string_to_enum("storage_type", storage_types, s, (long)defval, undef);
@@ -533,6 +605,21 @@ extern void mwr_get_pixelwand_from_pixelpacket(PixelWand *pixelwand, PixelPacket
 
 
 
+/*
+ *  Return the hex representation of the pixel as a Ruby string.
+ *  (The PixelWand method always returns the rgb() representation.)
+ */
+extern VALUE mwr_pixelwand_to_hex(Image *image, PixelWand *pixelwand)
+{
+    PixelPacket pixelpacket;
+
+    mwr_get_pixelpacket_from_pixelwand(&pixelpacket, pixelwand);
+    return mwr_pixelpacket_to_hex(image, &pixelpacket);
+}
+
+
+
+
 /*
  *  Return the hex representation of the pixel as a Ruby string.
  *  (The PixelWand method always returns the rgb() representation.)
@@ -659,16 +746,55 @@ static VALUE rescue_option(VALUE args, VALUE errinfo)
  *  rescue NoMethodError
  *      raise(ArgumentError, "undefined option :#{option}")
  *  end
+ *
+ *  Because the options hash is unordered in 1.8.*, we make two passes over the
+ *  options. The :stroke_opacity and :fill_opacity options must succeed the
+ *  :stroke and :fill options, otherwise the opacity specified by the colors
+ *  overrides the opacity specified by the :xxx_opacity options. So the first
+ *  pass specifically skips these two options, and the second pass skips over
+ *  all but these two options.
  */
-static int begin_option(VALUE option, VALUE value, VALUE obj)
+
+static int options_pass_1(VALUE option, VALUE value, VALUE obj)
 {
     VALUE args;
+    volatile VALUE fill_opacity, stroke_opacity;
+
+    fill_opacity = ID2SYM(rb_intern("fill_opacity"));
+    stroke_opacity = ID2SYM(rb_intern("stroke_opacity"));
+
+    if (!(option == fill_opacity || option == stroke_opacity))
+    {
+        args = rb_ary_new2(3);
+        rb_ary_push(args, option);
+        rb_ary_push(args, value);
+        rb_ary_push(args, obj);
+        (void) rb_rescue(call_option_setter, args, rescue_option, args);
+    }
+
+    return 0;
+}
+
+
+
+
+static int options_pass_2(VALUE option, VALUE value, VALUE obj)
+{
+    VALUE args;
+    volatile VALUE fill_opacity, stroke_opacity;
+
+    fill_opacity = ID2SYM(rb_intern("fill_opacity"));
+    stroke_opacity = ID2SYM(rb_intern("stroke_opacity"));
+
+    if (option == fill_opacity || option == stroke_opacity)
+    {
+        args = rb_ary_new2(3);
+        rb_ary_push(args, option);
+        rb_ary_push(args, value);
+        rb_ary_push(args, obj);
+        (void) rb_rescue(call_option_setter, args, rescue_option, args);
+    }
 
-    args = rb_ary_new2(3);
-    rb_ary_push(args, option);
-    rb_ary_push(args, value);
-    rb_ary_push(args, obj);
-    (void) rb_rescue(call_option_setter, args, rescue_option, args);
     return 0;
 }
 
@@ -682,7 +808,8 @@ void mwr_process_options(VALUE obj, VALUE options)
 {
     if (options != Qnil)
     {
-        rb_hash_foreach(options, begin_option, obj);
+        rb_hash_foreach(options, options_pass_1, obj);
+        rb_hash_foreach(options, options_pass_2, obj);
     }
 }
 

data/ext/magickwand/wand.c

@@ -1,6 +1,6 @@
 /*
  *  wand.c
- *  $Id: wand.c 147 2009-05-31 22:01:22Z rmagick $
+ *  $Id: wand.c 275 2009-08-13 22:30:55Z rmagick $
  *  Copyright (C) 2009 Timothy Paul Hunter
  */
 
@@ -253,7 +253,7 @@ leave:
 static VALUE wand_annotate(int argc, VALUE *argv, VALUE obj)
 {
     Wand *wand;
-    GC *gc;
+    Drawing *drawing;
     double x, y, angle;
     volatile VALUE graphics_context;
     VALUE v, text, options;
@@ -271,11 +271,11 @@ static VALUE wand_annotate(int argc, VALUE *argv, VALUE obj)
     y = mwr_get_option(options, "y", &v) ? NUM2DBL(v) : 0.0;
     angle = mwr_get_option(options, "angle", &v) ? NUM2DBL(v) : 0.0;
 
-    graphics_context = mwr_gc_new();
-    Data_Get_Struct(graphics_context, GC, gc);
+    graphics_context = mwr_drawing_new();
+    Data_Get_Struct(graphics_context, Drawing, drawing);
 
     // Override default NorthWest gravity. It's useless.
-    DrawSetGravity(gc->drawingwand, CenterGravity);
+    DrawSetGravity(drawing->wand, CenterGravity);
     mwr_process_options(graphics_context, options);
 
     Data_Get_Struct(obj, Wand, wand);
@@ -283,7 +283,7 @@ static VALUE wand_annotate(int argc, VALUE *argv, VALUE obj)
     MagickResetIterator(wand->magickwand);
     while (MagickNextImage(wand->magickwand) != MagickFalse)
     {
-        MagickAnnotateImage(wand->magickwand, gc->drawingwand, x, y, angle, text_string);
+        MagickAnnotateImage(wand->magickwand, drawing->wand, x, y, angle, text_string);
     }
 
     return obj;
@@ -471,6 +471,72 @@ static VALUE wand_background(VALUE obj)
 
 
 
+/*
+ *  returns the border color property for the 0th image
+ */
+static VALUE wand_bordercolor(VALUE obj)
+{
+    Wand *wand;
+    PixelWand *bordercolor;
+    Image *image;
+    volatile VALUE color;
+
+    if (FIX2LONG(wand_length(obj)) == 0)
+    {
+        return Qnil;
+    }
+
+    Data_Get_Struct(obj, Wand, wand);
+
+    MagickResetIterator(wand->magickwand);
+    bordercolor = NewPixelWand();
+    MagickGetImageBorderColor(wand->magickwand, bordercolor);
+    mwr_check_magickwand_error(wand->magickwand);
+
+    image = GetImageFromMagickWand(wand->magickwand);
+    mwr_check_magickwand_error(wand->magickwand);
+
+    color = mwr_pixelwand_to_hex(image, bordercolor);
+    DestroyPixelWand(bordercolor);
+
+    return color;
+}
+
+
+
+
+/*
+ *  sets the border color property for the 0th image
+ */
+static VALUE wand_bordercolor_set(VALUE obj, VALUE color)
+{
+    Wand *wand;
+    PixelWand *pixelwand;
+    char *bordercolor;
+
+    rb_check_frozen(obj);
+
+    Data_Get_Struct(obj, Wand, wand);
+
+    bordercolor = StringValuePtr(color);
+    pixelwand = NewPixelWand();
+    PixelSetColor(pixelwand, bordercolor);
+    mwr_check_pixelwand_error(pixelwand);
+
+    MagickResetIterator(wand->magickwand);
+    while (MagickNextImage(wand->magickwand) != MagickFalse)
+    {
+        (void) MagickSetImageBorderColor(wand->magickwand, pixelwand);
+        mwr_check_magickwand_error(wand->magickwand);
+    }
+    DestroyPixelWand(pixelwand);
+
+    return color;
+}
+
+
+
+
 static VALUE convolve(int argc, VALUE *argv, VALUE obj,
     MagickBooleanType (*convolve)(MagickWand *, const ChannelType, const double, const double))
 {
@@ -520,17 +586,17 @@ static VALUE wand_border(int argc, VALUE *argv, VALUE obj)
     Wand *wand;
     PixelWand *pixelwand;
     VALUE color, wt, ht;
-    char *border_color;
+    char *bordercolor;
     unsigned long width, height;
 
     rb_check_frozen(obj);
     (void) rb_scan_args(argc, argv, "12", &color, &wt, &ht);
-    border_color = StringValuePtr(color);
+    bordercolor = StringValuePtr(color);
     width = wt != Qnil ? NUM2ULONG(wt) : 1UL;
     height = ht != Qnil ? NUM2ULONG(ht) : width;
 
     pixelwand = NewPixelWand();
-    PixelSetColor(pixelwand, border_color);
+    PixelSetColor(pixelwand, bordercolor);
     mwr_check_pixelwand_error(pixelwand);
 
     Data_Get_Struct(obj, Wand, wand);
@@ -971,6 +1037,10 @@ static VALUE wand_display(VALUE obj)
     Wand *wand;
 
     Data_Get_Struct(obj, Wand, wand);
+    if (MagickGetNumberImages(wand->magickwand) == 0UL)
+    {
+        return Qnil;
+    }
     MagickDisplayImages(wand->magickwand, NULL);
     mwr_check_magickwand_error(wand->magickwand);
     return obj;
@@ -979,6 +1049,28 @@ static VALUE wand_display(VALUE obj)
 
 
 
+static VALUE wand_draw(VALUE obj, VALUE drawing_obj)
+{
+    Wand *wand;
+    Drawing *drawing;
+
+    rb_check_frozen(obj);
+    Data_Get_Struct(obj, Wand, wand);
+    Data_Get_Struct(drawing_obj, Drawing, drawing);
+
+    MagickResetIterator(wand->magickwand);
+    while (MagickNextImage(wand->magickwand) != MagickFalse)
+    {
+        MagickDrawImage(wand->magickwand, drawing->wand);
+        mwr_check_magickwand_error(wand->magickwand);
+    }
+
+    return obj;
+}
+
+
+
+
 /*
  *  (>= 1.8.7) if no block return enumerator
  */
@@ -2262,6 +2354,8 @@ void mwr_init_Wand(void)
     rb_define_method(mwr_cWand, "animate", wand_animate, -1);
     rb_define_method(mwr_cWand, "annotate", wand_annotate, -1);
     rb_define_method(mwr_cWand, "background", wand_background, 0);
+    rb_define_method(mwr_cWand, "bordercolor", wand_bordercolor, 0);
+    rb_define_method(mwr_cWand, "bordercolor=", wand_bordercolor_set, 1);
     rb_define_method(mwr_cWand, "blur", wand_blur, -1);
     rb_define_method(mwr_cWand, "border", wand_border, -1);
     rb_define_method(mwr_cWand, "colors", wand_colors, 0);
@@ -2273,6 +2367,7 @@ void mwr_init_Wand(void)
     rb_define_method(mwr_cWand, "depth", wand_depth, 0);
     rb_define_method(mwr_cWand, "dimensions", wand_dimensions, 0);
     rb_define_method(mwr_cWand, "display", wand_display, 0);
+    rb_define_method(mwr_cWand, "draw", wand_draw, 1);
     rb_define_method(mwr_cWand, "export_pixels", wand_export_pixels, -1);
     rb_define_method(mwr_cWand, "filename", wand_filename, 0);
     rb_define_method(mwr_cWand, "format", wand_format, 0);