magickwand 0.1.0 → 0.2.0

data/test/test_magickwand.rb

@@ -1,19 +1,10 @@
 require 'test/unit'
 require 'magickwand'
+require File.dirname(__FILE__) + '/freezer'
 
 # The test images are in the same directory as this file.
 BUTTON_IMAGES = Dir[File.dirname(__FILE__) + "/Button_*.gif"].freeze
 
-# Determine what exception is raised when you try to modify a frozen object
-begin
-   f = "string"
-   f.freeze
-   f[0] = "x"
-rescue TypeError
-   FreezeError = TypeError
-rescue RuntimeError
-   FreezeError = RuntimeError
-end
 
 
 class TestMagickWand < Test::Unit::TestCase
@@ -297,6 +288,28 @@ class TestMagickWand < Test::Unit::TestCase
       assert_raise(FreezeError) { wand.border("black") }
    end
 
+   def test_bordercolor
+      wand = MagickWand::Wand.new
+      wand.add_canvas 20
+      bordercolor = nil
+      assert_nothing_raised {bordercolor = wand.bordercolor}
+      assert_equal("#DFDFDFDFDFDF", bordercolor)
+      assert_nothing_raised { wand.bordercolor = "red" }
+      assert_equal("#FFFF00000000", wand.bordercolor)
+      assert_nothing_raised { wand.bordercolor = "blue" }
+      assert_equal("#00000000FFFF", wand.bordercolor)
+
+      # sets the border color on all the images in the wand
+      wand.add_canvas 20
+      assert_equal("#DFDFDFDFDFDF", wand[1].bordercolor)
+      assert_nothing_raised { wand.bordercolor = "green" }
+      assert_equal("#000080800000", wand.bordercolor)
+      assert_equal("#000080800000", wand[1].bordercolor)
+
+      wand.freeze
+      assert_raise(FreezeError) { wand.bordercolor = "red" }
+   end
+
    def test_clone
       wand = MagickWand::Wand.new
       wand.read BUTTON_IMAGES[0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: magickwand
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tim Hunter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -04:00
+date: 2009-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,9 +27,9 @@ files:
 - Rakefile
 - lib/magickwand.rb
 - ext/magickwand/magickwand.h
-- ext/magickwand/gc.c
 - ext/magickwand/utility.c
 - ext/magickwand/magickwand.c
+- ext/magickwand/drawing.c
 - ext/magickwand/extconf.rb
 - ext/magickwand/wand.c
 has_rdoc: true
@@ -59,15 +59,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: magickwand
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 1
 summary: A binding to ImageMagick
 test_files: 
 - test/Button_6.gif
 - test/Button_5.gif
+- test/test_drawing.rb
 - test/Button_1.gif
 - test/Button_0.gif
+- test/freezer.rb
 - test/Button_2.gif
 - test/Button_8.gif
 - test/Button_9.gif

data/ext/magickwand/gc.c

@@ -1,464 +0,0 @@
-
-/*
- *  gc.c
- *  $Id: gc.c 118 2009-05-30 20:11:39Z rmagick $
- *  Copyright (C) 2009 Timothy Paul Hunter
- */
-
-#include "magickwand.h"
-
-
-static void gc_destroy(void *);
-
-
-
-static VALUE gc_allocate(VALUE klass)
-{
-    GC *gc;
-    return  Data_Make_Struct(klass, GC, NULL, gc_destroy, gc);
-}
-
-
-
-
-static void gc_destroy(void *p)
-{
-    GC *gc = (GC *)p;
-
-    if (gc->drawingwand)
-    {
-        gc->drawingwand = DestroyDrawingWand(gc->drawingwand);
-    }
-}
-
-
-
-
-/*
- *  Construct a new GC object
- */
-VALUE mwr_gc_new(void)
-{
-    VALUE obj;
-    GC *gc;
-
-    obj = Data_Make_Struct(mwr_cGC, GC, NULL, gc_destroy, gc);
-    gc->drawingwand = NewDrawingWand();
-    return obj;
-}
-
-
-
-
-/*
- *  :align => string
- *  set text alignment
- */
-static VALUE gc_set_align(VALUE obj, VALUE align)
-{
-    GC *gc;
-    AlignType type;
-
-    rb_check_frozen(obj);
-    type = mwr_string_to_aligntype(align, LeftAlign, RaiseUndefinedOption);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetTextAlignment(gc->drawingwand, type);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-
-/*
- *  :antialias => boolean
- *  turn text antialias on or off
- */
-static VALUE gc_set_antialias(VALUE obj, VALUE antialias)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetTextAntialias(gc->drawingwand, RTEST(antialias) ? MagickTrue : MagickFalse);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :decoration => string
- */
-static VALUE gc_set_decoration(VALUE obj, VALUE decoration)
-{
-    GC *gc;
-    DecorationType type;
-
-    rb_check_frozen(obj);
-    type = mwr_string_to_decorationtype(decoration, NoDecoration, RaiseUndefinedOption);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetTextDecoration(gc->drawingwand, type);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :encoding => string
- */
-static VALUE gc_set_encoding(VALUE obj, VALUE encoding)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetTextEncoding(gc->drawingwand, StringValuePtr(encoding));
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-/*
- *  :family => string
- */
-static VALUE gc_set_family(VALUE obj, VALUE family)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFontFamily(gc->drawingwand, StringValuePtr(family));
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :fill => string
- */
-static VALUE gc_set_fill(VALUE obj, VALUE fill)
-{
-    GC *gc;
-    PixelWand *pixelwand;
-
-    rb_check_frozen(obj);
-    pixelwand = NewPixelWand();
-
-    PixelSetColor(pixelwand, StringValuePtr(fill));
-    mwr_check_pixelwand_error(pixelwand);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFillColor(gc->drawingwand, pixelwand);
-    pixelwand = DestroyPixelWand(pixelwand);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :fill_opacity => float
- */
-static VALUE gc_set_fill_opacity(VALUE obj, VALUE fill_opacity)
-{
-    GC *gc;
-    double opacity;
-
-    rb_check_frozen(obj);
-    opacity = NUM2DBL(fill_opacity);
-    if (opacity < 0.0)
-    {
-        opacity = 0.0;
-    }
-    else if (opacity > 1.0)
-    {
-        opacity = 1.0;
-    }
-
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFillOpacity(gc->drawingwand, opacity);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :font => string
- */
-static VALUE gc_set_font(VALUE obj, VALUE font)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFont(gc->drawingwand, StringValuePtr(font));
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :gravity => string
- */
-static VALUE gc_set_gravity(VALUE obj, VALUE gravity)
-{
-    GC *gc;
-    GravityType type;
-
-    rb_check_frozen(obj);
-    type = mwr_string_to_gravitytype(gravity, NorthWestGravity, RaiseUndefinedOption);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetGravity(gc->drawingwand, type);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :interword_spacing => float
- */
-static VALUE gc_set_interword_spacing(VALUE obj, VALUE interword_spacing)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetTextInterwordSpacing(gc->drawingwand, NUM2DBL(interword_spacing));
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :kerning => float
- */
-static VALUE gc_set_kerning(VALUE obj, VALUE kerning)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetTextKerning(gc->drawingwand, NUM2DBL(kerning));
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :pointsize => float
- */
-static VALUE gc_set_pointsize(VALUE obj, VALUE pointsize)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFontSize(gc->drawingwand, NUM2DBL(pointsize));
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :stretch => string
- */
-static VALUE gc_set_stretch(VALUE obj, VALUE stretch)
-{
-    GC *gc;
-    StretchType type;
-
-    rb_check_frozen(obj);
-    type = mwr_string_to_stretchtype(stretch, AnyStretch, RaiseUndefinedOption);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFontStretch(gc->drawingwand, type);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-/*
- *  :stroke => string
- */
-static VALUE gc_set_stroke(VALUE obj, VALUE stroke)
-{
-    GC *gc;
-    PixelWand *pixelwand;
-
-    rb_check_frozen(obj);
-    pixelwand = NewPixelWand();
-
-    PixelSetColor(pixelwand, StringValuePtr(stroke));
-    mwr_check_pixelwand_error(pixelwand);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetStrokeColor(gc->drawingwand, pixelwand);
-    pixelwand = DestroyPixelWand(pixelwand);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :stroke_opacity => float
- */
-static VALUE gc_set_stroke_opacity(VALUE obj, VALUE stroke_opacity)
-{
-    GC *gc;
-    double opacity;
-
-    rb_check_frozen(obj);
-    opacity = NUM2DBL(stroke_opacity);
-    if (opacity < 0.0)
-    {
-        opacity = 0.0;
-    }
-    else if (opacity > 1.0)
-    {
-        opacity = 1.0;
-    }
-
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetStrokeOpacity(gc->drawingwand, opacity);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :strokewidth => float
- */
-static VALUE gc_set_strokewidth(VALUE obj, VALUE strokewidth)
-{
-    GC *gc;
-
-    rb_check_frozen(obj);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetStrokeWidth(gc->drawingwand, NUM2DBL(strokewidth));
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :style => string
- */
-static VALUE gc_set_style(VALUE obj, VALUE style)
-{
-    GC *gc;
-    StyleType type;
-
-    rb_check_frozen(obj);
-    type = mwr_string_to_styletype(style, NormalStyle, RaiseUndefinedOption);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFontStyle(gc->drawingwand, type);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :undercolor => string
- */
-static VALUE gc_set_undercolor(VALUE obj, VALUE undercolor)
-{
-    GC *gc;
-    PixelWand *pixelwand;
-
-    rb_check_frozen(obj);
-    pixelwand = NewPixelWand();
-
-    PixelSetColor(pixelwand, StringValuePtr(undercolor));
-    mwr_check_pixelwand_error(pixelwand);
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetTextUnderColor(gc->drawingwand, pixelwand);
-    pixelwand = DestroyPixelWand(pixelwand);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  :weight => fixnum
- */
-static VALUE gc_set_weight(VALUE obj, VALUE weight)
-{
-    GC *gc;
-    unsigned long w;
-
-    rb_check_frozen(obj);
-    if (TYPE(weight) == T_STRING)
-    {
-        w = mwr_string_to_weight(weight, 0, RaiseUndefinedOption);
-    }
-    else
-    {
-        w = FIX2ULONG(weight);
-    }
-    Data_Get_Struct(obj, GC, gc);
-    DrawSetFontWeight(gc->drawingwand, w);
-    mwr_check_drawingwand_error(gc->drawingwand);
-    return obj;
-}
-
-
-
-
-/*
- *  MagickWand::GC class
- */
-void mwr_init_GC(void)
-{
-    mwr_cGC = rb_define_class_under(mwr_mMagickWand, "GC", rb_cObject);
-    rb_define_alloc_func(mwr_cGC, gc_allocate);
-
-    // Private property setters are called during option processing.
-    rb_define_private_method(mwr_cGC, "set_align", gc_set_align, 1);
-    rb_define_private_method(mwr_cGC, "set_antialias", gc_set_antialias, 1);
-    rb_define_private_method(mwr_cGC, "set_decoration", gc_set_decoration, 1);
-    rb_define_private_method(mwr_cGC, "set_encoding", gc_set_encoding, 1);
-    rb_define_private_method(mwr_cGC, "set_family", gc_set_family, 1);
-    rb_define_private_method(mwr_cGC, "set_fill", gc_set_fill, 1);
-    rb_define_private_method(mwr_cGC, "set_fill_opacity", gc_set_fill_opacity, 1);
-    rb_define_private_method(mwr_cGC, "set_font", gc_set_font, 1);
-    rb_define_private_method(mwr_cGC, "set_gravity", gc_set_gravity, 1);
-    rb_define_private_method(mwr_cGC, "set_interword_spacing", gc_set_interword_spacing, 1);
-    rb_define_private_method(mwr_cGC, "set_kerning", gc_set_kerning, 1);
-    rb_define_private_method(mwr_cGC, "set_pointsize", gc_set_pointsize, 1);
-    rb_define_private_method(mwr_cGC, "set_stretch", gc_set_stretch, 1);
-    rb_define_private_method(mwr_cGC, "set_stroke", gc_set_stroke, 1);
-    rb_define_private_method(mwr_cGC, "set_stroke_opacity", gc_set_stroke_opacity, 1);
-    rb_define_private_method(mwr_cGC, "set_strokewidth", gc_set_strokewidth, 1);
-    rb_define_private_method(mwr_cGC, "set_style", gc_set_style, 1);
-    rb_define_private_method(mwr_cGC, "set_undercolor", gc_set_undercolor, 1);
-    rb_define_private_method(mwr_cGC, "set_weight", gc_set_weight, 1);
-}