rmagick 2.5.2 → 2.6.0

data/ext/RMagick/MANIFEST

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-2.5.2 - 18:32:44 07/15/08
+MANIFEST for RMagick-2.6.0 - 18:47:56 09/10/08
 
 doc/ilist.html
 doc/scripts/stripeTables.js
@@ -59,6 +59,7 @@ doc/ex/images/Red_Rocks.jpg
 doc/ex/images/duck7.gif
 doc/ex/images/Button_O.gif
 doc/ex/images/Ballerina3.jpg
+doc/ex/images/Rocks_On_Beach.miff
 doc/ex/images/Button_U.gif
 doc/ex/images/Violin.jpg
 doc/ex/images/Button_L.gif
@@ -87,8 +88,11 @@ doc/ex/images/Button_G.gif
 doc/ex/images/Button_1.gif
 doc/ex/images/Shorts.jpg
 doc/ex/images/Flower_Hat.jpg
+doc/ex/images/Leaf.miff
 doc/ex/images/Hot_Air_Balloons_H.jpg
+doc/ex/images/Apple.miff
 doc/ex/images/model.miff
+doc/ex/images/Yellow_Rose.miff
 doc/ex/images/Button_5.gif
 doc/ex/images/Button_X.gif
 doc/ex/images/Polynesia.jpg
@@ -191,6 +195,8 @@ doc/ex/median_filter.rb
 doc/ex/rvg_clippath.rb
 doc/ex/bounding_box.rb
 doc/ex/pattern2.rb
+doc/ex/affinity.rb
+doc/ex/composite_tiled.rb
 doc/ex/shave.rb
 doc/ex/wave.rb
 doc/ex/color_fill_to_border.rb
@@ -224,9 +230,10 @@ doc/ex/roll.rb
 doc/ex/rect02.rb
 doc/ex/rvg_opacity.rb
 doc/ex/equalize.rb
-doc/ex/map.rb
 doc/ex/get_pixels.rb
 doc/ex/polyline.rb
+doc/ex/affinity_images.rb
+doc/ex/level_colors.rb
 doc/ex/composite_layers.rb
 doc/ex/text01.rb
 doc/ex/crop.rb
@@ -237,7 +244,6 @@ doc/ex/enhance.rb
 doc/ex/tspan01.rb
 doc/ex/flatten_images.rb
 doc/ex/morph.rb
-doc/ex/map_f.rb
 doc/ex/implode.rb
 doc/ex/tspan02.rb
 doc/ex/cubic02.rb

data/ext/RMagick/extconf.rb

@@ -1,7 +1,7 @@
 require "mkmf"
 require "date"
 
-RMAGICK_VERS = "2.5.2"
+RMAGICK_VERS = "2.6.0"
 MIN_RUBY_VERS = "1.8.2"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.0"
@@ -148,10 +148,13 @@ have_func("snprintf", headers)
 
 
   ["AcquireQuantumMemory",           # 6.3.5-9
+   "AffinityImage",                  # 6.4.3-6
+   "AffinityImages",                 # 6.4.3-6
    "ClutImageChannel",               # 6.3.5-8
    "CompositeLayers",                # 6.3.3-?
    "ConvertHSLToRGB",                # 6.3.5-9
    "ConvertRGBToHSL",                # 6.3.5-9
+   "DeskewImage",                    # 6.4.2-5
    "DistortImage",                   # 6.3.5
    "EncipherImage",                  # 6.3.8-6
    "EqualizeImageChannel",           # 6.3.6-9
@@ -164,18 +167,23 @@ have_func("snprintf", headers)
    "GetStringInfoDatum",             # 6.3.2
    "InterpretImageProperties",       # 6.3.2
    "IsHistogramImage",               # 6.3.5
+   "LevelImageColors",               # 6.4.2
+   "LevelizeImageChannel",           # 6.4.2
    "LinearStretchImage",             # 6.3.1
    "LiquidRescaleImage",             # 6.3.8-2
    "MagickCoreGenesis",              # 6.3.4
    "OpaquePaintImageChannel",        # 6.3.7-10
    "PolaroidImage",                  # 6.3.1-6
    "RecolorImage",                   # 6.3.1-3
+   "RemoveImageArtifact",            # 6.3.6
    "ResetImagePage",                 # 6.3.3
    "ResizeQuantumMemory",            # 6.3.5-9
    "SetImageAlphaChannel",           # 6.3.6-9
+   "SetImageArtifact",               # 6.3.6
    "SetImageMask",                   # 6.3.1
    "SetImageProperty",               # 6.3.1
-   "SetImageRegistry",               # 6.3.4-?
+   "SetImageRegistry",               # 6.3.4
+   "SparseColorInterpolate",         # 6.3.4-5
    "SyncImageProfiles",              # 6.3.2
    "TransparentPaintImage",          # 6.3.7-10
    ].each do |func|
@@ -212,6 +220,7 @@ end
 
 have_struct_member("ImageInfo", "profile", headers)   # 6.3.2
 have_type("AlphaChannelType", headers)                # 6.3.5
+have_type("DitherMethod", headers)                    # 6.4.2
 have_type("ImageLayerMethod", headers)                # 6.3.6 replaces MagickLayerMethod
 have_type("long double", headers)
 have_type("unsigned long long", headers)
@@ -230,7 +239,12 @@ have_enum_values("CompressionType", ["DXT1Compression",                      # 6
                                      "DXT3Compression",                      # 6.3.9-3
                                      "DXT5Compression"], headers)            # 6.3.9-3
 have_enum_values("DistortImageMethod", ["ArcDistortion",                     # 6.3.5-5
-                               "PerspectiveProjectionDistortion"], headers)  # 6.3.5-9
+                                        "BarrelDistortion",                  # 6.4.2-5
+                                        "DePolarDistortion",                 # 6.4.2-6
+                                        "PerspectiveProjectionDistortion",   # 6.3.5-9
+                                        "PolarDistortion",                   # 6.4.2-6
+                                        "PolynomialDistortion",              # 6.4.2-4
+                                        "ShepardsDistortion"], headers)      # 6.4.2-4
 have_enum_values("FilterTypes", ["KaiserFilter",                             # 6.3.6
                                  "WelshFilter",                              # 6.3.6-4
                                  "ParzenFilter",                             # 6.3.6-4
@@ -256,6 +270,8 @@ have_enum_value("NoiseType", "RandomNoise", headers)                         # 6
 have_enum_values("VirtualPixelMethod", ["MaskVirtualPixelMethod",            # 6.3.3
                                         "BlackVirtualPixelMethod",           # 6.3.5
                                         "GrayVirtualPixelMethod",            # 6.3.5
+                                        "HorizontalTileVirtualPixelMethod",  # 6.4.2-6
+                                        "VerticalTileVirtualPixelMethod",    # 6.4.2-6
                                         "WhiteVirtualPixelMethod"], headers) # 6.3.5
 
 

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.236 2008/07/13 21:18:27 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.248 2008/09/02 23:40:18 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -297,6 +297,9 @@ EXTERN VALUE Class_DisposeType;
 #if defined(HAVE_DISTORTIMAGE)
 EXTERN VALUE Class_DistortImageMethod;
 #endif
+#if defined(HAVE_TYPE_DITHERMETHOD)
+EXTERN VALUE Class_DitherMethod;
+#endif
 EXTERN VALUE Class_EndianType;
 EXTERN VALUE Class_FilterTypes;
 EXTERN VALUE Class_GravityType;
@@ -310,6 +313,9 @@ EXTERN VALUE Class_PaintMethod;
 EXTERN VALUE Class_PreviewType;
 EXTERN VALUE Class_RenderingIntent;
 EXTERN VALUE Class_ResolutionType;
+#if defined(HAVE_SPARSECOLORINTERPOLATE)
+EXTERN VALUE Class_SparseColorInterpolateMethod;
+#endif
 EXTERN VALUE Class_StorageType;
 EXTERN VALUE Class_StretchType;
 EXTERN VALUE Class_StyleType;
@@ -329,6 +335,7 @@ EXTERN ID rm_ID_flag;              // "flag"
 EXTERN ID rm_ID_from_s;            // "from_s"
 EXTERN ID rm_ID_Geometry;          // "Geometry"
 EXTERN ID rm_ID_GeometryValue;     // "GeometryValue"
+EXTERN ID rm_ID_has_key_q;         // "has_key?"
 EXTERN ID rm_ID_height;            // "height"
 EXTERN ID rm_ID_initialize_copy;   // "initialize_copy"
 EXTERN ID rm_ID_length;            // "length"
@@ -616,6 +623,7 @@ ATTR_WRITER(PolaroidOptions, border_color);
 
 
  // rmilist.c
+extern VALUE ImageList_affinity(int, VALUE *, VALUE);
 extern VALUE ImageList_animate(int, VALUE *, VALUE);
 extern VALUE ImageList_append(VALUE, VALUE);
 extern VALUE ImageList_average(VALUE);
@@ -767,6 +775,7 @@ ATTR_ACCESSOR(Image, y_resolution)
 
 extern ChannelType extract_channels(int *, VALUE *);
 extern void raise_ChannelType_error(VALUE);
+extern void add_format_prefix(Info *, VALUE);
 
 extern VALUE Image_alloc(VALUE);
 extern VALUE Image_initialize(int, VALUE *, VALUE);
@@ -781,6 +790,7 @@ extern VALUE Image_add_noise(VALUE, VALUE);
 extern VALUE Image_add_noise_channel(int, VALUE *, VALUE);
 extern VALUE Image_add_profile(VALUE, VALUE);
 extern VALUE Image_affine_transform(VALUE, VALUE);
+extern VALUE Image_affinity(int, VALUE *, VALUE);
 extern VALUE Image_alpha(int, VALUE *, VALUE);
 extern VALUE Image_alpha_q(VALUE);
 extern VALUE Image_aref(VALUE, VALUE);
@@ -814,10 +824,12 @@ extern VALUE Image_colorize(int, VALUE *, VALUE);
 extern VALUE Image_colormap(int, VALUE *, VALUE);
 extern VALUE Image_combine(int, VALUE *, VALUE);
 extern VALUE Image_composite(int, VALUE *, VALUE);
+extern VALUE Image_composite_affine(VALUE, VALUE, VALUE);
 extern VALUE Image_composite_bang(int, VALUE *, VALUE);
 extern VALUE Image_composite_channel(int, VALUE *, VALUE);
 extern VALUE Image_composite_channel_bang(int, VALUE *, VALUE);
-extern VALUE Image_composite_affine(VALUE, VALUE, VALUE);
+extern VALUE Image_composite_tiled(int, VALUE *, VALUE);
+extern VALUE Image_composite_tiled_bang(int, VALUE *, VALUE);
 extern VALUE Image_compress_colormap_bang(VALUE);
 extern VALUE Image_constitute(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_contrast(int, VALUE *, VALUE);
@@ -829,8 +841,10 @@ extern VALUE Image_crop(int, VALUE *, VALUE);
 extern VALUE Image_crop_bang(int, VALUE *, VALUE);
 extern VALUE Image_cycle_colormap(VALUE, VALUE);
 extern VALUE Image_decipher(VALUE, VALUE);
+extern VALUE Image_define(VALUE, VALUE, VALUE);
 extern VALUE Image_delete_profile(VALUE, VALUE);
 extern VALUE Image_delete_compose_mask(VALUE);
+extern VALUE Image_deskew(int, VALUE *, VALUE);
 extern VALUE Image_despeckle(VALUE);
 extern VALUE Image_destroy_bang(VALUE);
 extern VALUE Image_destroyed_q(VALUE);
@@ -876,6 +890,8 @@ extern VALUE Image_init_copy(VALUE, VALUE);
 extern VALUE Image_inspect(VALUE);
 extern VALUE Image_level2(int, VALUE *, VALUE);
 extern VALUE Image_level_channel(int, VALUE *, VALUE);
+extern VALUE Image_level_colors(int, VALUE *, VALUE);
+extern VALUE Image_levelize_channel(int, VALUE *, VALUE);
 extern VALUE Image_linear_stretch(int, VALUE *, VALUE);
 extern VALUE Image_liquid_rescale(int, VALUE *, VALUE);
 extern VALUE Image__load(VALUE, VALUE);
@@ -943,6 +959,7 @@ extern VALUE Image_signature(VALUE);
 extern VALUE Image_sketch(int, VALUE *, VALUE);
 extern VALUE Image_solarize(int, VALUE *, VALUE);
 extern VALUE Image_spaceship(VALUE, VALUE);
+extern VALUE Image_sparse_color(int, VALUE *, VALUE);
 extern VALUE Image_splice(int, VALUE *, VALUE);
 extern VALUE Image_spread(int, VALUE *, VALUE);
 extern VALUE Image_stegano(VALUE, VALUE, VALUE);
@@ -965,6 +982,7 @@ extern VALUE Image_transverse(VALUE);
 extern VALUE Image_transverse_bang(VALUE);
 extern VALUE Image_trim(int, VALUE *, VALUE);
 extern VALUE Image_trim_bang(int, VALUE *, VALUE);
+extern VALUE Image_undefine(VALUE, VALUE);
 extern VALUE Image_unique_colors(VALUE);
 extern VALUE Image_unsharp_mask(int, VALUE *, VALUE);
 extern VALUE Image_unsharp_mask_channel(int, VALUE *, VALUE);
@@ -1006,7 +1024,7 @@ extern VALUE  EndianType_new(EndianType);
 extern VALUE  FilterTypes_new(FilterTypes);
 extern VALUE  GravityType_new(GravityType);
 extern VALUE  Font_to_s(VALUE);
-extern VALUE  ImageList_cur_image(VALUE);
+extern VALUE  rm_cur_image(VALUE);
 extern VALUE  ImageMagickError_initialize(int, VALUE *, VALUE);
 extern VALUE  ImageType_new(ImageType);
 extern VALUE  InterlaceType_new(InterlaceType);
@@ -1087,15 +1105,12 @@ extern void  *magick_safe_realloc(void *, const size_t, const size_t);
 extern void   magick_clone_string(char **, const char *);
 extern VALUE  rm_enum_new(VALUE, VALUE, VALUE);
 extern VALUE  rm_no_freeze(VALUE);
-#if !defined(StringValuePtr)
-extern char  *rm_string_value_ptr(volatile VALUE *);
-#endif
-extern char  *rm_string_value_ptr_len(volatile VALUE *, long *);
 extern int    rm_strcasecmp(const char *, const char *);
 extern int    rm_strncasecmp(const char *, const char *, size_t);
 extern void   rm_check_ary_len(VALUE, long);
 extern Image *rm_check_destroyed(VALUE);
 extern Image *rm_check_frozen(VALUE);
+extern VALUE  rm_to_s(VALUE);
 extern char  *rm_str2cstr(VALUE, long *);
 extern int    rm_check_num2dbl(VALUE);
 extern double rm_fuzz_to_dbl(VALUE);
@@ -1126,6 +1141,7 @@ extern Image *rm_clone_image(Image *);
 extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetType, const MagickSizeType, void *);
 extern VALUE  rm_exif_by_entry(Image *);
 extern VALUE  rm_exif_by_number(Image *);
+extern void   rm_get_optional_arguments(VALUE);
 
 #endif
 

data/ext/RMagick/rmdraw.c

@@ -1,4 +1,4 @@
-/* $Id: rmdraw.c,v 1.64 2008/05/21 22:32:40 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.67 2008/09/03 00:08:35 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmdraw.c
@@ -34,6 +34,7 @@ Draw_affine_eq(VALUE self, VALUE matrix)
     return self;
 }
 
+
 /*
     Method:     Draw#align=
     Purpose:    set the text alignment
@@ -49,6 +50,7 @@ Draw_align_eq(VALUE self, VALUE align)
     return self;
 }
 
+
 /*
     Method:     Draw#decorate=
     Purpose:    decorate attribute writer
@@ -64,6 +66,7 @@ Draw_decorate_eq(VALUE self, VALUE decorate)
     return self;
 }
 
+
 /*
     Method:     Draw#density=
     Purpose:    density attribute writer
@@ -80,6 +83,7 @@ Draw_density_eq(VALUE self, VALUE density)
     return self;
 }
 
+
 /*
     Method:     Draw#encoding=
     Purpose:    encoding attribute writer
@@ -96,6 +100,7 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
     return self;
 }
 
+
 /*
     Method:     Draw#fill=
     Purpose:    fill attribute writer
@@ -111,6 +116,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
     return self;
 }
 
+
 /*
     Method:     Draw#fill_pattern=
     Purpose:    Accept an image as a fill pattern
@@ -134,7 +140,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
 
     if (!NIL_P(pattern))
     {
-        pattern = ImageList_cur_image(pattern);
+        pattern = rm_cur_image(pattern);
         image = rm_check_destroyed(pattern);
         // Do not trace creation
         draw->info->fill_pattern = rm_clone_image(image);
@@ -143,6 +149,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
     return self;
 }
 
+
 /*
     Method:     Draw#font=
     Purpose:    font attribute writer
@@ -159,6 +166,7 @@ Draw_font_eq(VALUE self, VALUE font)
     return self;
 }
 
+
 /*
     Method:     Draw#font_family=
     Purpose:    font_family attribute writer
@@ -175,6 +183,7 @@ Draw_font_family_eq(VALUE self, VALUE family)
     return self;
 }
 
+
 /*
     Method:     Draw#font_stretch=
     Purpose:    font_stretch attribute writer
@@ -190,6 +199,7 @@ Draw_font_stretch_eq(VALUE self, VALUE stretch)
     return self;
 }
 
+
 /*
     Method:     Draw#font_style=
     Purpose:    font_style attribute writer
@@ -205,14 +215,13 @@ Draw_font_style_eq(VALUE self, VALUE style)
     return self;
 }
 
+
 /*
     Method:     Draw#font_weight=
     Purpose:    font_weight attribute writer
     Notes:      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)
 {
@@ -262,6 +271,7 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
     return self;
 }
 
+
 /*
     Method:     Draw#gravity=
     Purpose:    gravity attribute writer
@@ -289,6 +299,7 @@ Draw_gravity_eq(VALUE self, VALUE grav)
     return self;
 }
 
+
 /*
     Method:     Draw#pointsize=
     Purpose:    pointsize attribute writer
@@ -304,6 +315,7 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
     return self;
 }
 
+
 /*
     Method:     Magick::Draw#rotation=degrees
     Purpose:    set rotation attribute value
@@ -346,6 +358,7 @@ Draw_rotation_eq(VALUE self, VALUE deg)
     return self;
 }
 
+
 /*
     Method:     Draw#stroke=
     Purpose:    stroke attribute writer
@@ -361,6 +374,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
     return self;
 }
 
+
 /*
     Method:     Draw#stroke_pattern=
     Purpose:    Accept an image as a stroke pattern
@@ -385,7 +399,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
     if (!NIL_P(pattern))
     {
         // DestroyDrawInfo destroys the clone
-        pattern = ImageList_cur_image(pattern);
+        pattern = rm_cur_image(pattern);
         image = rm_check_destroyed(pattern);
         // Do not trace creation
         draw->info->stroke_pattern = rm_clone_image(image);
@@ -394,6 +408,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
     return self;
 }
 
+
 /*
     Method:     Draw#stroke_width=
     Purpose:    stroke_width attribute writer
@@ -409,6 +424,7 @@ Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
     return self;
 }
 
+
 /*
     Method:     Draw#text_antialias=
     Purpose:    text_antialias attribute writer
@@ -424,6 +440,7 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
     return self;
 }
 
+
 /*
     Method:     Draw#tile=
     Purpose:    tile attribute writer
@@ -434,6 +451,7 @@ Draw_tile_eq(VALUE self, VALUE image)
     return Draw_fill_pattern_eq(self, image);
 }
 
+
 /*
     Method:     Draw#undercolor=
     Purpose:    undercolor attribute writer
@@ -449,6 +467,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
     return self;
 }
 
+
 /*
     Method:     Draw#annotate(img, w, h, x, y, text) <{optional parms}>
     Purpose:    annotates an image with text
@@ -478,7 +497,7 @@ VALUE Draw_annotate(
     Data_Get_Struct(self, Draw, draw);
     keep = draw->info->affine;
 
-    image_arg = ImageList_cur_image(image_arg);
+    image_arg = rm_cur_image(image_arg);
     image = rm_check_frozen(image_arg);
 
     // If we have an optional parm block, run it in self's context,
@@ -576,7 +595,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     }
 
     // Retrieve the image to composite
-    image = ImageList_cur_image(argv[4]);
+    image = rm_cur_image(argv[4]);
     (void) rm_check_destroyed(image);
 
     x = NUM2DBL(argv[0]);
@@ -675,6 +694,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+
 /*
     Method:     Draw#draw(i)
     Purpose:    Execute the stored drawing primitives on the current image
@@ -686,7 +706,7 @@ Draw_draw(VALUE self, VALUE image_arg)
     Draw *draw;
     Image *image;
 
-    image_arg = ImageList_cur_image(image_arg);
+    image_arg = rm_cur_image(image_arg);
     image = rm_check_frozen(image_arg);
 
     Data_Get_Struct(self, Draw, draw);
@@ -757,6 +777,7 @@ Draw_get_multiline_type_metrics(
     return get_type_metrics(argc, argv, self, GetMultilineTypeMetrics);
 }
 
+
 /*
     Method:     Draw#initialize_copy
     Purpose:    initialize clone, dup methods
@@ -803,6 +824,7 @@ Draw_initialize(VALUE self)
     return self;
 }
 
+
 /*
     Method:     inspect
     Purpose:    display the primitives
@@ -816,12 +838,12 @@ Draw_inspect(VALUE self)
     return draw->primitives ? draw->primitives : rb_str_new2("(no primitives defined)");
 }
 
+
 /*
     Method:     Draw.new/Draw.allocate
     Purpose:    Create a new Draw object
     Raises:     ImageMagickError if no memory
 */
-
 VALUE Draw_alloc(VALUE class)
 {
     Draw *draw;
@@ -834,6 +856,7 @@ VALUE Draw_alloc(VALUE class)
     return draw_obj;
 }
 
+
 /*
     Method:     Draw#primitive
     Purpose:    Add a drawing primitive to the list of primitives in the
@@ -860,6 +883,7 @@ Draw_primitive(VALUE self, VALUE primitive)
     return self;
 }
 
+
 /*
     Static:     mark_Draw
     Purpose:    mark referenced objects
@@ -875,6 +899,7 @@ mark_Draw(void *drawptr)
     }
 }
 
+
 /*
     Static:     destroy_Draw
     Purpose:    free the memory associated with an Draw object
@@ -908,7 +933,8 @@ destroy_Draw(void *drawptr)
     Static:     new_DrawOptions
     Purpose:    Allocate & initialize a DrawOptions object.
 */
-static VALUE new_DrawOptions(void)
+static VALUE
+new_DrawOptions(void)
 {
     return DrawOptions_initialize(Draw_alloc(Class_DrawOptions));
 }
@@ -921,7 +947,8 @@ static VALUE new_DrawOptions(void)
     Notes:      The DrawOptions class is the same as the Draw class except
                 is has only the attribute writer functions.
 */
-VALUE DrawOptions_alloc(VALUE class)
+VALUE
+DrawOptions_alloc(VALUE class)
 {
     Draw *draw_options;
     volatile VALUE draw_options_obj;
@@ -938,7 +965,8 @@ VALUE DrawOptions_alloc(VALUE class)
     Method:     DrawOptions#initialize
     Purpose:    Initialize a DrawOptions object
 */
-VALUE DrawOptions_initialize(VALUE self)
+VALUE
+DrawOptions_initialize(VALUE self)
 {
     Draw *draw_options;
 
@@ -975,6 +1003,7 @@ Montage_background_color_eq(VALUE self, VALUE color)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#border_color(color-name)
     Purpose:    set border_color value
@@ -989,6 +1018,7 @@ Montage_border_color_eq(VALUE self, VALUE color)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#border_width(width)
     Purpose:    set border_width value
@@ -1003,6 +1033,7 @@ Montage_border_width_eq(VALUE self, VALUE width)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#compose(width)
     Purpose:    set a composition operator
@@ -1017,6 +1048,7 @@ Montage_compose_eq(VALUE self, VALUE compose)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#filename(name)
     Purpose:    set filename value
@@ -1031,6 +1063,7 @@ Montage_filename_eq(VALUE self, VALUE filename)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#fill(color-name)
     Purpose:    set fill value
@@ -1045,6 +1078,7 @@ Montage_fill_eq(VALUE self, VALUE color)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#font(font-name)
     Purpose:    set font value
@@ -1060,6 +1094,7 @@ Montage_font_eq(VALUE self, VALUE font)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#frame(frame-geometry)
     Purpose:    set frame value
@@ -1074,12 +1109,13 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
     volatile VALUE frame;
 
     Data_Get_Struct(self, Montage, montage);
-    frame = rb_funcall(frame_arg, rm_ID_to_s, 0);
+    frame = rm_to_s(frame_arg);
     magick_clone_string(&montage->info->frame, StringValuePtr(frame));
 
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#geometry(geometry)
     Purpose:    set geometry value
@@ -1091,12 +1127,13 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
     volatile VALUE geometry;
 
     Data_Get_Struct(self, Montage, montage);
-    geometry = rb_funcall(geometry_arg, rm_ID_to_s, 0);
+    geometry = rm_to_s(geometry_arg);
     magick_clone_string(&montage->info->geometry, StringValuePtr(geometry));
 
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#gravity(gravity-type)
     Purpose:    set gravity value
@@ -1111,6 +1148,7 @@ Montage_gravity_eq(VALUE self, VALUE gravity)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#initialize
     Purpose:    Place-holder
@@ -1122,6 +1160,7 @@ Montage_initialize(VALUE self)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#matte_color(color-name)
     Purpose:    set matte_color value
@@ -1136,6 +1175,7 @@ Montage_matte_color_eq(VALUE self, VALUE color)
     return self;
 }
 
+
 /*
     Method:     Montage.new
     Purpose:    Create a new Montage object
@@ -1171,12 +1211,14 @@ Montage_alloc(VALUE class)
     return montage_obj;
 }
 
+
 /*
     Extern:     rm_montage_new()
     Purpose:    Return a new Magick::Montage object
 */
 
-VALUE rm_montage_new(void)
+VALUE
+rm_montage_new(void)
 {
     return Montage_initialize(Montage_alloc(Class_Montage));
 }
@@ -1207,6 +1249,7 @@ destroy_Montage(void *obj)
     xfree(montage);
 }
 
+
 /*
     Method:     Magick::Montage#pointsize=size
     Purpose:    set pointsize value
@@ -1221,6 +1264,7 @@ Montage_pointsize_eq(VALUE self, VALUE size)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#shadow=shadow
     Purpose:    set shadow value
@@ -1235,6 +1279,7 @@ Montage_shadow_eq(VALUE self, VALUE shadow)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#stroke(color-name)
     Purpose:    set stroke value
@@ -1249,6 +1294,7 @@ Montage_stroke_eq(VALUE self, VALUE color)
     return self;
 }
 
+
 /*
     Method:     Montage#texture(texture-image)
     Purpose:    set texture value
@@ -1271,7 +1317,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
         montage->info->texture = NULL;
     }
 
-    texture = ImageList_cur_image(texture);
+    texture = rm_cur_image(texture);
     texture_image = rm_check_destroyed(texture);
 
     // Write a temp copy of the image & save its name.
@@ -1281,6 +1327,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#tile(tile)
     Purpose:    set tile value
@@ -1292,12 +1339,13 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
     volatile VALUE tile;
 
     Data_Get_Struct(self, Montage, montage);
-    tile = rb_funcall(tile_arg, rm_ID_to_s, 0);
+    tile = rm_to_s(tile_arg);
     magick_clone_string(&montage->info->tile, StringValuePtr(tile));
 
     return self;
 }
 
+
 /*
     Method:     Magick::Montage#title(title)
     Purpose:    set title value
@@ -1373,7 +1421,8 @@ PolaroidOptions_initialize(VALUE self)
     Purpose:    allocate a PolaroidOptions instance
     Notes:      Internal use
 */
-VALUE rm_polaroid_new(void)
+VALUE
+rm_polaroid_new(void)
 {
     return PolaroidOptions_initialize(PolaroidOptions_alloc(Class_PolaroidOptions));
 }
@@ -1383,7 +1432,8 @@ VALUE rm_polaroid_new(void)
     Method:     PolaroidOptions#shadow_color=
     Purpose:    Set the shadow color attribute
 */
-VALUE PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
+VALUE
+PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
 {
     Draw *draw;
 
@@ -1397,7 +1447,8 @@ VALUE PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
     Method:     PolaroidOptions#border_color=
     Purpose:    Set the border color attribute
 */
-VALUE PolaroidOptions_border_color_eq(VALUE self, VALUE border)
+VALUE
+PolaroidOptions_border_color_eq(VALUE self, VALUE border)
 {
     Draw *draw;
 
@@ -1407,7 +1458,8 @@ VALUE PolaroidOptions_border_color_eq(VALUE self, VALUE border)
 }
 
 
-static VALUE get_dummy_tm_img(VALUE klass)
+static VALUE
+get_dummy_tm_img(VALUE klass)
 {
 #define DUMMY_IMG_CLASS_VAR "@@_dummy_img_"
     volatile VALUE dummy_img = 0;
@@ -1489,7 +1541,7 @@ get_type_metrics(
             Data_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, image);
             break;
         case 2:
-            t = ImageList_cur_image(argv[0]);
+            t = rm_cur_image(argv[0]);
             image = rm_check_destroyed(t);
             text = rm_str2cstr(argv[1], &text_l);
             break;                  // okay