rmagick 2.5.2 → 2.6.0

data/ext/RMagick/rminfo.c

@@ -1,4 +1,4 @@
-/* $Id: rminfo.c,v 1.71 2008/05/21 22:32:41 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.72 2008/08/26 22:36:15 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rminfo.c
@@ -278,7 +278,7 @@ Info_aset(int argc, VALUE *argv, VALUE self)
     else
     {
         /* Allow any argument that supports to_s */
-        value = rb_funcall(value, rm_ID_to_s, 0);
+        value = rm_to_s(value);
         value_p = StringValuePtr(value);
 
         (void) RemoveImageOption(info, ckey);
@@ -541,7 +541,7 @@ Info_define(int argc, VALUE *argv, VALUE self)
     {
         case 3:
             /* Allow any argument that supports to_s */
-            fmt_arg = rb_funcall(argv[2], rm_ID_to_s, 0);
+            fmt_arg = rb_String(argv[2]);
             value = (const char *)StringValuePtr(fmt_arg);
         case 2:
             key = rm_str2cstr(argv[1], &key_l);
@@ -665,7 +665,7 @@ Info_density_eq(VALUE self, VALUE density_arg)
         return self;
     }
 
-    density = rb_funcall(density_arg, rm_ID_to_s, 0);
+    density = rm_to_s(density_arg);
     dens = StringValuePtr(density);
     if (!IsGeometry(dens))
     {
@@ -830,7 +830,7 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
         return self;
     }
 
-    extract = rb_funcall(extract_arg, rm_ID_to_s, 0);
+    extract = rm_to_s(extract_arg);
     extr = StringValuePtr(extract);
     if (!IsGeometry(extr))
     {
@@ -1283,7 +1283,7 @@ Info_origin_eq(VALUE self, VALUE origin_arg)
         return self;
     }
 
-    origin_str = rb_funcall(origin_arg, rm_ID_to_s, 0);
+    origin_str = rm_to_s(origin_arg);
     origin = GetPageGeometry(StringValuePtr(origin_str));
 
     if (IsGeometry(origin) == MagickFalse)
@@ -1326,7 +1326,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
         info->page = NULL;
         return self;
     }
-    geom_str = rb_funcall(page_arg, rm_ID_to_s, 0);
+    geom_str = rm_to_s(page_arg);
     geometry=GetPageGeometry(StringValuePtr(geom_str));
     if (*geometry == '\0')
     {
@@ -1442,7 +1442,7 @@ Info_size_eq(VALUE self, VALUE size_arg)
         return self;
     }
 
-    size = rb_funcall(size_arg, rm_ID_to_s, 0);
+    size = rm_to_s(size_arg);
     sz = StringValuePtr(size);
     if (!IsGeometry(sz))
     {
@@ -1549,7 +1549,7 @@ Info_tile_offset_eq(VALUE self, VALUE offset)
     volatile VALUE offset_str;
     char *tile_offset;
 
-    offset_str = rb_funcall(offset, rm_ID_to_s, 0);
+    offset_str = rm_to_s(offset);
     tile_offset = StringValuePtr(offset_str);
     if (!IsGeometry(tile_offset))
     {

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.252 2008/07/13 21:18:28 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.266 2008/08/31 20:00:39 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -66,6 +66,7 @@ Magick_colors(VALUE class)
     }
 }
 
+
 /*
   Method:   Magick::fonts [ { |fontinfo| } ]
   Purpose:  If called with the optional block, iterates over the fonts,
@@ -123,7 +124,8 @@ Magick_fonts(VALUE class)
             There are 3 implementations.
 */
 
-static VALUE MagickInfo_to_format(const MagickInfo *magick_info)
+static VALUE
+MagickInfo_to_format(const MagickInfo *magick_info)
 {
     char mode[4];
 
@@ -135,6 +137,7 @@ static VALUE MagickInfo_to_format(const MagickInfo *magick_info)
     return rb_str_new(mode, sizeof(mode));
 }
 
+
 VALUE
 Magick_init_formats(VALUE class)
 {
@@ -256,7 +259,6 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
 }
 
 
-
 /*
     Method      Magick.set_cache_threshold(megabytes)
     Purpose:    sets the amount of free memory allocated for the
@@ -273,6 +275,7 @@ Magick_set_cache_threshold(VALUE class, VALUE threshold)
     return class;
 }
 
+
 /*
     Method:     Magick.set_log_event_mask(event,...) -> Magick
     Notes:      "event" is one of "all", "annotate", "blob", "cache",
@@ -318,14 +321,12 @@ Magick_set_log_format(VALUE class, VALUE format)
 }
 
 
-
 /*
   External:     Init_RMagick2
   Purpose:      define the classes and constants
   Arguments:    void
   Returns:      void
 */
-
 void
 Init_RMagick2(void)
 {
@@ -355,6 +356,7 @@ Init_RMagick2(void)
     rm_ID_from_s           = rb_intern("from_s");
     rm_ID_Geometry         = rb_intern("Geometry");
     rm_ID_GeometryValue    = rb_intern("GeometryValue");
+    rm_ID_has_key_q        = rb_intern("has_key?");
     rm_ID_height           = rb_intern("height");
     rm_ID_initialize_copy  = rb_intern("initialize_copy");
     rm_ID_length           = rb_intern("length");
@@ -479,6 +481,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "add_noise_channel", Image_add_noise_channel, -1);
     rb_define_method(Class_Image, "add_profile", Image_add_profile, 1);
     rb_define_method(Class_Image, "affine_transform", Image_affine_transform, 1);
+    rb_define_method(Class_Image, "affinity", Image_affinity, -1);
     rb_define_method(Class_Image, "alpha", Image_alpha, -1);
     rb_define_method(Class_Image, "alpha?", Image_alpha_q, 0);
     rb_define_method(Class_Image, "[]", Image_aref, 1);
@@ -517,6 +520,8 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "composite_affine", Image_composite_affine, 2);
     rb_define_method(Class_Image, "composite_channel", Image_composite_channel, -1);
     rb_define_method(Class_Image, "composite_channel!", Image_composite_channel_bang, -1);
+    rb_define_method(Class_Image, "composite_tiled", Image_composite_tiled, -1);
+    rb_define_method(Class_Image, "composite_tiled!", Image_composite_tiled_bang, -1);
     rb_define_method(Class_Image, "compress_colormap!", Image_compress_colormap_bang, 0);
     rb_define_method(Class_Image, "contrast", Image_contrast, -1);
     rb_define_method(Class_Image, "contrast_stretch_channel", Image_contrast_stretch_channel, -1);
@@ -527,6 +532,8 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "crop!", Image_crop_bang, -1);
     rb_define_method(Class_Image, "cycle_colormap", Image_cycle_colormap, 1);
     rb_define_method(Class_Image, "decipher", Image_decipher, 1);
+    rb_define_method(Class_Image, "define", Image_define, 2);
+    rb_define_method(Class_Image, "deskew", Image_deskew, -1);
     rb_define_method(Class_Image, "delete_compose_mask", Image_delete_compose_mask, 0);
     rb_define_method(Class_Image, "delete_profile", Image_delete_profile, 1);
     rb_define_method(Class_Image, "despeckle", Image_despeckle, 0);
@@ -574,6 +581,8 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "inspect", Image_inspect, 0);
     rb_define_method(Class_Image, "level2", Image_level2, -1);
     rb_define_method(Class_Image, "level_channel", Image_level_channel, -1);
+    rb_define_method(Class_Image, "level_colors", Image_level_colors, -1);
+    rb_define_method(Class_Image, "levelize_channel", Image_levelize_channel, -1);
     rb_define_method(Class_Image, "linear_stretch", Image_linear_stretch, -1);
     rb_define_method(Class_Image, "liquid_rescale", Image_liquid_rescale, -1);
     rb_define_method(Class_Image, "magnify", Image_magnify, 0);
@@ -637,6 +646,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "sketch", Image_sketch, -1);
     rb_define_method(Class_Image, "solarize", Image_solarize, -1);
     rb_define_method(Class_Image, "<=>", Image_spaceship, 1);
+    rb_define_method(Class_Image, "sparse_color", Image_sparse_color, -1);
     rb_define_method(Class_Image, "splice", Image_splice, -1);
     rb_define_method(Class_Image, "spread", Image_spread, -1);
     rb_define_method(Class_Image, "stegano", Image_stegano, 2);
@@ -659,6 +669,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "transverse!", Image_transverse_bang, 0);
     rb_define_method(Class_Image, "trim", Image_trim, -1);
     rb_define_method(Class_Image, "trim!", Image_trim_bang, -1);
+    rb_define_method(Class_Image, "undefine", Image_undefine, 1);
     rb_define_method(Class_Image, "unique_colors", Image_unique_colors, 0);
     rb_define_method(Class_Image, "unsharp_mask", Image_unsharp_mask, -1);
     rb_define_method(Class_Image, "unsharp_mask_channel", Image_unsharp_mask_channel, -1);
@@ -677,6 +688,7 @@ Init_RMagick2(void)
 
     // Define an alias for Object#display before we override it
     rb_define_alias(Class_ImageList, "__display__", "display");
+    rb_define_method(Class_ImageList, "affinity", ImageList_affinity, -1);
     rb_define_method(Class_ImageList, "animate", ImageList_animate, -1);
     rb_define_method(Class_ImageList, "append", ImageList_append, 1);
     rb_define_method(Class_ImageList, "average", ImageList_average, 0);
@@ -1243,13 +1255,37 @@ Init_RMagick2(void)
         ENUMERATOR(AffineProjectionDistortion)
 #if defined(HAVE_ENUM_ARCDISTORTION)
         ENUMERATOR(ArcDistortion)
+#endif
+#if defined(HAVE_ENUM_POLARDISTORTION)
+        ENUMERATOR(PolarDistortion)
+#endif
+#if defined(HAVE_ENUM_DEPOLARDISTORTION)
+        ENUMERATOR(DePolarDistortion)
+#endif
+#if defined(HAVE_ENUM_BARRELDISTORTION)
+        ENUMERATOR(BarrelDistortion)
 #endif
         ENUMERATOR(BilinearDistortion)
         ENUMERATOR(PerspectiveDistortion)
-#if defined(HAVE_PERSPECTIVEPROJECTIONDISTORTION)
+#if defined(HAVE_ENUM_PERSPECTIVEPROJECTIONDISTORTION)
         ENUMERATOR(PerspectiveProjectionDistortion)
+#endif
+#if defined(HAVE_ENUM_POLYNOMIALDISTORTION)
+        ENUMERATOR(PolynomialDistortion)
 #endif
         ENUMERATOR(ScaleRotateTranslateDistortion)
+#if defined(HAVE_ENUM_SHEPARDSDISTORTION)
+        ENUMERATOR(ShepardsDistortion)
+#endif
+    END_ENUM
+#endif
+
+#if defined(HAVE_TYPE_DITHERMETHOD)
+    DEF_ENUM(DitherMethod)
+        ENUMERATOR(UndefinedDitherMethod)
+        ENUMERATOR(NoDitherMethod)
+        ENUMERATOR(RiemersmaDitherMethod)
+        ENUMERATOR(FloydSteinbergDitherMethod)
     END_ENUM
 #endif
 
@@ -1516,6 +1552,17 @@ Init_RMagick2(void)
         ENUMERATOR(PixelsPerCentimeterResolution)
     END_ENUM
 
+#if defined(HAVE_SPARSECOLORINTERPOLATE)
+    DEF_ENUM(SparseColorInterpolateMethod)
+        ENUMERATOR(UndefinedColorInterpolate)
+        ENUMERATOR(BarycentricColorInterpolate)
+        ENUMERATOR(BilinearColorInterpolate)
+        ENUMERATOR(PolynomialColorInterpolate)
+        ENUMERATOR(ShepardsColorInterpolate)
+        ENUMERATOR(VoronoiColorInterpolate)
+    END_ENUM
+#endif
+
     // StorageType
     DEF_ENUM(StorageType)
         ENUMERATOR(UndefinedPixel)
@@ -1572,6 +1619,12 @@ Init_RMagick2(void)
 #endif
 #if defined(HAVE_ENUM_WHITEVIRTUALPIXELMETHOD)
         ENUMERATOR(WhiteVirtualPixelMethod)
+#endif
+#if defined(HAVE_ENUM_HORIZONTALTILEVIRTUALPIXELMETHOD)
+        ENUMERATOR(HorizontalTileVirtualPixelMethod)
+#endif
+#if defined(HAVE_ENUM_VERTICALTILEVIRTUALPIXELMETHOD)
+        ENUMERATOR(VerticalTileVirtualPixelMethod)
 #endif
     END_ENUM
 
@@ -1656,7 +1709,8 @@ Init_RMagick2(void)
  *  Notes:      Bypass the test by defining the constant RMAGICK_BYPASS_VERSION_TEST
  *              to 'true' at the top level, before requiring 'RMagick'
 */
-static void test_Magick_version(void)
+static void
+test_Magick_version(void)
 {
     unsigned long version_number;
     const char *version_str;
@@ -1696,7 +1750,8 @@ static void test_Magick_version(void)
     Static:     version_constants
     Purpose:    create Version, Magick_version, and Version_long constants.
 */
-static void version_constants(void)
+static void
+version_constants(void)
 {
     const char *mgk_version;
     volatile VALUE str;
@@ -1713,7 +1768,7 @@ static void version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2008/07/13 21:18:28 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/08/31 20:00:39 $) Copyright (C) 2008 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"

data/ext/RMagick/rmutil.c

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.156 2008/06/21 00:24:10 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.162 2008/09/03 00:00:35 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -32,7 +32,8 @@ static VALUE Pixel_from_MagickPixelPacket(const MagickPixelPacket *);
                 caused by integer overflow. Added in 6.3.5-9 but backwards
                 compatible with prior releases.
 */
-void *magick_safe_malloc(const size_t count, const size_t quantum)
+void *
+magick_safe_malloc(const size_t count, const size_t quantum)
 {
 #if defined(HAVE_ACQUIREQUANTUMMEMORY)
     void *ptr;
@@ -57,7 +58,9 @@ void *magick_safe_malloc(const size_t count, const size_t quantum)
 #endif
 }
 
-void *magick_malloc(const size_t size)
+
+void *
+magick_malloc(const size_t size)
 {
     void *ptr;
     ptr = AcquireMagickMemory(size);
@@ -69,12 +72,16 @@ void *magick_malloc(const size_t size)
     return ptr;
 }
 
-void magick_free(void *ptr)
+
+void
+magick_free(void *ptr)
 {
     (void) RelinquishMagickMemory(ptr);
 }
 
-void *magick_safe_realloc(void *memory, const size_t count, const size_t quantum)
+
+void *
+magick_safe_realloc(void *memory, const size_t count, const size_t quantum)
 {
 #if defined(HAVE_RESIZEQUANTUMMEMORY)
     void *v;
@@ -96,7 +103,9 @@ void *magick_safe_realloc(void *memory, const size_t count, const size_t quantum
 #endif
 }
 
-void *magick_realloc(void *ptr, const size_t size)
+
+void *
+magick_realloc(void *ptr, const size_t size)
 {
     void *v;
     v = ResizeMagickMemory(ptr, size);
@@ -107,6 +116,7 @@ void *magick_realloc(void *ptr, const size_t size)
     return v;
 }
 
+
 /*
     Extern:     magick_clone_string
     Purpose:    make a copy of a string in malloc'd memory
@@ -115,7 +125,8 @@ void *magick_realloc(void *ptr, const size_t size)
                 its return value.
 
 */
-void magick_clone_string(char **new_str, const char *str)
+void
+ magick_clone_string(char **new_str, const char *str)
 {
     (void) CloneString(new_str, str);
 }
@@ -142,8 +153,6 @@ rm_strcasecmp(const char *s1, const char *s2)
 }
 
 
-
-
 /*
  *  Extern:     rm_strncasecmp(s1, s2, n)
  *  Purpose:    compare s1 and s2 ignoring case
@@ -169,7 +178,6 @@ rm_strncasecmp(const char *s1, const char *s2, size_t n)
 }
 
 
-
 /*
  *  Extern:     rm_check_ary_len(ary, len)
  *  Purpose:    raise exception if array too short
@@ -225,6 +233,23 @@ VALUE
 rm_no_freeze(VALUE obj)
 {
     rb_raise(rb_eTypeError, "can't freeze %s", rb_class2name(CLASS_OF(obj)));
+    return (VALUE)0;
+}
+
+
+/*
+    Extern:     rm_to_s
+    Purpose:    return obj.to_s, or obj if obj is already a string.
+*/
+VALUE
+rm_to_s(VALUE obj)
+{
+
+    if (TYPE(obj) != T_STRING)
+    {
+        return rb_funcall(obj, rm_ID_to_s, 0);
+    }
+    return obj;
 }
 
 
@@ -268,8 +293,10 @@ rescue_not_str(VALUE arg)
 {
     rb_raise(rb_eTypeError, "argument must be a number or a string in the form 'NN%%' (%s given)",
             rb_class2name(CLASS_OF(arg)));
+    return (VALUE)0;
 }
 
+
 /*
  *  Extern:     rm_percentage(obj)
  *  Purpose:    Return a double between 0.0 and 1.0, inclusive.
@@ -357,7 +384,8 @@ rescue_not_dbl(VALUE ignored)
     Extern:     rm_check_num2dbl
     Purpose:    Return 1 if the object can be converted to a double, 0 otherwise.
 */
-int rm_check_num2dbl(VALUE obj)
+int
+rm_check_num2dbl(VALUE obj)
 {
     return FIX2INT(rb_rescue(check_num2dbl, obj, rescue_not_dbl, (VALUE)0));
 }
@@ -368,7 +396,8 @@ int rm_check_num2dbl(VALUE obj)
  *  Purpose:    Given a string in the form NN% return the corresponding double.
  *
 */
-double rm_str_to_pct(VALUE str)
+double
+rm_str_to_pct(VALUE str)
 {
     long pct;
     char *pct_str, *end;
@@ -473,7 +502,7 @@ rm_app2quantum(VALUE obj)
 
 
 /*
-    Extern:     ImageList_cur_image
+    Extern:     rm_cur_image
     Purpose:    Sends the "cur_image" method to the object. If 'img'
                 is an ImageList, then cur_image is self[@scene].
                 If 'img' is an image, then cur_image is simply
@@ -481,11 +510,12 @@ rm_app2quantum(VALUE obj)
     Returns:    the return value from "cur_image"
 */
 VALUE
-ImageList_cur_image(VALUE img)
+rm_cur_image(VALUE img)
 {
     return rb_funcall(img, rm_ID_cur_image, 0);
 }
 
+
 /*
     Method:     Magick::PrimaryInfo#to_s
     Purpose:    Create a string representation of a Magick::PrimaryInfo
@@ -501,6 +531,7 @@ PrimaryInfo_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
+
 /*
     Method:     Magick::Chromaticity#to_s
     Purpose:    Create a string representation of a Magick::Chromaticity
@@ -523,6 +554,7 @@ ChromaticityInfo_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
+
 /*
     Method:     Magick::Pixel#to_s
     Purpose:    Create a string representation of a Magick::Pixel
@@ -539,6 +571,7 @@ Pixel_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
+
 /*
     Method:     Magick::Pixel.from_color(string)
     Purpose:    Construct an Magick::Pixel corresponding to the given color name.
@@ -577,7 +610,8 @@ Pixel_from_color(VALUE class, VALUE name)
     Notes:      Same code as the private function SetMagickPixelPacket
                 in ImageMagick.
 */
-static void rm_set_magick_pixel_packet(Pixel *pixel, IndexPacket *index_packet, MagickPixelPacket *pp)
+static void
+rm_set_magick_pixel_packet(Pixel *pixel, IndexPacket *index_packet, MagickPixelPacket *pp)
 {
     pp->red     = (MagickRealType) pixel->red;
     pp->green   = (MagickRealType) pixel->green;
@@ -587,7 +621,6 @@ static void rm_set_magick_pixel_packet(Pixel *pixel, IndexPacket *index_packet,
 }
 
 
-
 /*
     Method:     Magick::Pixel#to_color(compliance=AllCompliance, matte=false,
                                        depth=QuantumDepth, hex=false)
@@ -681,6 +714,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     return rb_str_new2(name);
 }
 
+
 /*
     Method:     Pixel#to_HSL    *** DEPRECATED ***
     Purpose:    Converts an RGB pixel to the array
@@ -707,6 +741,7 @@ Pixel_to_HSL(VALUE self)
     return hsl;
 }
 
+
 /*
     Method:     Pixel.from_HSL  *** DEPRECATED ***
     Purpose:    Constructs an RGB pixel from the array
@@ -743,7 +778,6 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
 }
 
 
-
 /*
     Method:     Pixel#from_hsla(hue, saturation, lightness, alpha=1)
     Purpose:    Replace brain-dead from_HSL, above.
@@ -865,6 +899,7 @@ Pixel_eql_q(VALUE self, VALUE other)
     return NUM2INT(Pixel_spaceship(self, other)) == 0 ? Qtrue : Qfalse;
 }
 
+
 /*
     Method:  Pixel#fcmp(other[, fuzz[, colorspace]])
     Purpose: Compare pixel values for equality
@@ -949,6 +984,7 @@ Pixel_hash(VALUE self)
 
 }
 
+
 /*
     Method:  Pixel#intensity
     Purpose: Return the "intensity" of a pixel
@@ -1000,12 +1036,12 @@ DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(yellow, blue)
 DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(black, opacity)
 
 
-
 /*
     Method:     Pixel#<=>
     Purpose:    Support Comparable mixin
 */
-VALUE Pixel_spaceship(VALUE self, VALUE other)
+VALUE
+Pixel_spaceship(VALUE self, VALUE other)
 {
     Pixel *this, *that;
 
@@ -1110,7 +1146,8 @@ Pixel_initialize(int argc, VALUE *argv, VALUE self)
     Purpose:    "Case equal" operator for Pixel
 */
 
-VALUE Pixel_case_eq(VALUE self, VALUE other)
+VALUE
+Pixel_case_eq(VALUE self, VALUE other)
 {
     Pixel *this, *that;
 
@@ -1168,7 +1205,8 @@ Pixel_clone(VALUE self)
     Method:     Pixel#initialize_copy
     Purpose:    initialize clone, dup methods
 */
-VALUE Pixel_init_copy(VALUE self, VALUE orig)
+VALUE
+Pixel_init_copy(VALUE self, VALUE orig)
 {
     Pixel *copy, *original;
 
@@ -1181,7 +1219,6 @@ VALUE Pixel_init_copy(VALUE self, VALUE orig)
 }
 
 
-
 /*
     Method:     Magick::Rectangle#to_s
     Purpose:    Create a string representation of a Magick::Rectangle
@@ -1198,6 +1235,7 @@ RectangleInfo_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
+
 /*
     Method:     Magick::SegmentInfo#to_s
     Purpose:    Create a string representation of a Magick::Segment
@@ -1214,6 +1252,7 @@ SegmentInfo_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
+
 /*
     Extern:     PixelPacket_to_Color_Name
     Purpose:    Map the color intensity to a named color
@@ -1236,6 +1275,7 @@ PixelPacket_to_Color_Name(Image *image, PixelPacket *color)
     return rb_str_new2(name);
 }
 
+
 /*
     Extern:     PixelPacket_to_Color_Name_Info
     Purpose:    Map the color intensity to a named color
@@ -1269,6 +1309,7 @@ PixelPacket_to_Color_Name_Info(Info *info, PixelPacket *color)
     return color_name;
 }
 
+
 /*
     Static:     Color_Name_to_PixelPacket
     Purpose:    Convert a color name to a PixelPacket
@@ -1439,6 +1480,7 @@ ColorspaceType_new(ColorspaceType cs)
 
 }
 
+
 /*
  *  Static:     ComplianceType_new
     Purpose:    construct a ComplianceType enum object for the specified value
@@ -1531,6 +1573,7 @@ CompositeOperator_name(CompositeOperator op)
     return "UndefinedCompositeOp";
 }
 
+
 /*
    External:    CompositeOperator_new
    Purpose:     Construct a CompositeOperator enum object for the specified value
@@ -1687,7 +1730,6 @@ FilterTypes_new(FilterTypes type)
 }
 
 
-
 /*
     Static:     EndianType_name
     Purpose:    Return the name of a EndianType enum as a string
@@ -1704,6 +1746,7 @@ EndianType_name(EndianType type)
     return "UndefinedEndian";
 }
 
+
 /*
     External:   EndianType.new
     Purpose:    Construct an EndianType enum object
@@ -1755,7 +1798,6 @@ GravityType_new(GravityType type)
 }
 
 
-
 /*
     Static:     ImageType_name
     Purpose:    Return the name of a ImageType enum as a string
@@ -1921,6 +1963,7 @@ LAYERMETHODTYPE_NAME(LAYERMETHODTYPE method)
     return "UndefinedLayer";
 }
 
+
 VALUE
 LAYERMETHODTYPE_NEW(LAYERMETHODTYPE method)
 {
@@ -1949,7 +1992,6 @@ RenderingIntent_name(RenderingIntent intent)
 }
 
 
-
 /*
     External:   RenderingIntent_new
     Purpose:    Construct an RenderingIntent enum object for the specified value.
@@ -2097,6 +2139,7 @@ Color_to_ColorInfo(ColorInfo *ci, VALUE st)
     }
 }
 
+
 /*
     Static:     destroy_ColorInfo
     Purpose:    free the storage allocated by Color_to_ColorInfo, above.
@@ -2108,6 +2151,7 @@ destroy_ColorInfo(ColorInfo *ci)
     ci->name = NULL;
 }
 
+
 /*
     Method:     Color#to_s
     Purpose:    Return a string representation of a Magick::Color object
@@ -2134,6 +2178,7 @@ Color_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
+
 /*
     Extern:     Pixel_from_PixelPacket
     Purpose:    Create a Magick::Pixel object from a PixelPacket structure.
@@ -2180,8 +2225,10 @@ color_arg_rescue(VALUE arg)
 {
     rb_raise(rb_eTypeError, "argument must be color name or pixel (%s given)",
             rb_class2name(CLASS_OF(arg)));
+    return (VALUE)0;
 }
 
+
 /*
     Extern:     Color_to_PixelPacket
     Purpose:    Convert either a String color name or
@@ -2241,6 +2288,7 @@ PrimaryInfo_from_PrimaryInfo(PrimaryInfo *p)
                     , INT2FIX(p->x), INT2FIX(p->y), INT2FIX(p->z));
 }
 
+
 /*
     Extern:     PrimaryInfo_to_PrimaryInfo
     Purpose:    Convert a Magick::PrimaryInfo object to a PrimaryInfo structure
@@ -2264,6 +2312,7 @@ PrimaryInfo_to_PrimaryInfo(PrimaryInfo *pi, VALUE sp)
     pi->z = m == Qnil ? 0.0 : NUM2DBL(m);
 }
 
+
 /*
     Extern:     PointInfo_to_Point(pp)
     Purpose:    Create a Magick::Point object from a PointInfo structure.
@@ -2275,6 +2324,7 @@ PointInfo_to_Point(PointInfo *p)
                     , INT2FIX(p->x), INT2FIX(p->y));
 }
 
+
 /*
     Extern:     Point_to_PointInfo
     Purpose:    Convert a Magick::Point object to a PointInfo structure
@@ -2297,7 +2347,6 @@ Point_to_PointInfo(PointInfo *pi, VALUE sp)
 }
 
 
-
 /*
     Extern:     ChromaticityInfo_new(pp)
     Purpose:    Create a Magick::ChromaticityInfo object from a
@@ -2320,6 +2369,7 @@ ChromaticityInfo_new(ChromaticityInfo *ci)
                     , red_primary, green_primary, blue_primary, white_point);
 }
 
+
 /*
     Extern:     ChromaticityInfo_to_ChromaticityInfo
     Purpose:    Extract the elements from a Magick::ChromaticityInfo
@@ -2380,6 +2430,7 @@ ChromaticityInfo_to_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     ci->white_point.z = 0.0;
 }
 
+
 /*
     External:   Rectangle_from_RectangleInfo
     Purpose:    Convert a RectangleInfo structure to a Magick::Rectangle
@@ -2399,6 +2450,7 @@ Rectangle_from_RectangleInfo(RectangleInfo *rect)
                     , width, height, x, y);
 }
 
+
 /*
     External:   Rectangle_to_RectangleInfo
     Purpose:    Convert a Magick::Rectangle to a RectangleInfo structure.
@@ -2424,6 +2476,7 @@ Rectangle_to_RectangleInfo(RectangleInfo *rect, VALUE sr)
     rect->y      = m == Qnil ? 0 : NUM2LONG (m);
 }
 
+
 /*
     External:   Segment_from_SegmentInfo
     Purpose:    Convert a SegmentInfo structure to a Magick::Segment
@@ -2440,6 +2493,7 @@ Segment_from_SegmentInfo(SegmentInfo *segment)
     return rb_funcall(Class_Segment, rm_ID_new, 4, x1, y1, x2, y2);
 }
 
+
 /*
     External:   Segment_to_SegmentInfo
     Purpose:    Convert a Magick::Segment to a SegmentInfo structure.
@@ -2466,6 +2520,7 @@ Segment_to_SegmentInfo(SegmentInfo *segment, VALUE s)
     segment->y2 = m == Qnil ? 0.0 : NUM2DBL(m);
 }
 
+
 /*
     Static:     StretchType_new
     Purpose:    Construct a StretchType enum for a specified StretchType value
@@ -2489,6 +2544,7 @@ StyleType_new(StyleType style)
     return rm_enum_new(Class_StyleType, ID2SYM(rb_intern(name)), INT2FIX(style));
 }
 
+
 /*
     External:   Font_from_TypeInfo
     Purpose:    Convert a TypeInfo structure to a Magick::Font
@@ -2515,6 +2571,7 @@ Font_from_TypeInfo(const TypeInfo *ti)
                     , stretch, weight, encoding, foundry, format);
 }
 
+
 /*
     External:   Font_to_TypeInfo
     Purpose:    Convert a Magick::Font to a TypeInfo structure
@@ -2585,6 +2642,7 @@ destroy_TypeInfo(TypeInfo *ti)
     ti->format = NULL;
 }
 
+
 /*
     External:   Font_to_s
     Purpose:    implement the Font#to_s method
@@ -2629,6 +2687,7 @@ Font_to_s(VALUE self)
 
 }
 
+
 /*
     External:   TypeMetric_from_TypeMetric
     Purpose:    Convert a TypeMetric structure to a Magick::TypeMetric
@@ -2657,6 +2716,7 @@ TypeMetric_from_TypeMetric(TypeMetric *tm)
                     , underline_position, underline_thickness);
 }
 
+
 /*
     External:   TypeMetric_to_TypeMetric
     Purpose:    Convert a Magick::TypeMetric to a TypeMetric structure.
@@ -2697,6 +2757,7 @@ TypeMetric_to_TypeMetric(TypeMetric *tm, VALUE st)
     tm->underline_thickness = m == Qnil ? 0.0 : NUM2DBL(m);
 }
 
+
 /*
     Method:     Magick::TypeMetric#to_s
     Purpose:    Create a string representation of a Magick::TypeMetric
@@ -2720,7 +2781,6 @@ TypeMetric_to_s(VALUE self)
 }
 
 
-
 /*
     Static:     VirtualPixelMethod_name
     Purpose:    Return the string representation of a VirtualPixelMethod value
@@ -2750,6 +2810,12 @@ VirtualPixelMethod_name(VirtualPixelMethod method)
 #endif
 #if defined(HAVE_ENUM_WHITEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(WhiteVirtualPixelMethod)
+#endif
+#if defined(HAVE_ENUM_HORIZONTALTILEVIRTUALPIXELMETHOD)
+        ENUM_TO_NAME(HorizontalTileVirtualPixelMethod)
+#endif
+#if defined(HAVE_ENUM_VERTICALTILEVIRTUALPIXELMETHOD)
+        ENUM_TO_NAME(VerticalTileVirtualPixelMethod)
 #endif
     }
 
@@ -2773,7 +2839,8 @@ VirtualPixelMethod_new(VirtualPixelMethod style)
  *  Extern:     rm_define_enum_type
  *  Purpose:    set up a subclass of Enum
 */
-VALUE rm_define_enum_type(const char *tag)
+VALUE
+rm_define_enum_type(const char *tag)
 {
     VALUE class;
 
@@ -2790,7 +2857,8 @@ VALUE rm_define_enum_type(const char *tag)
     Extern:  rm_enum_new (1.8)
     Purpose: Construct a new Enum subclass instance
 */
-VALUE rm_enum_new(VALUE class, VALUE sym, VALUE val)
+VALUE
+rm_enum_new(VALUE class, VALUE sym, VALUE val)
 {
     VALUE argv[2];
 
@@ -2799,11 +2867,13 @@ VALUE rm_enum_new(VALUE class, VALUE sym, VALUE val)
     return rb_obj_freeze(rb_class_new_instance(2, argv, class));
 }
 
+
 /*
     Extern:  Enum_alloc (1.8)
     Purpose: Enum class alloc function
 */
-VALUE Enum_alloc(VALUE class)
+VALUE
+Enum_alloc(VALUE class)
 {
    MagickEnum *magick_enum;
    volatile VALUE enumr;
@@ -2818,7 +2888,8 @@ VALUE Enum_alloc(VALUE class)
     Method:  Enum#initialize
     Purpose: Initialize a new Enum instance
 */
-VALUE Enum_initialize(VALUE self, VALUE sym, VALUE val)
+VALUE
+Enum_initialize(VALUE self, VALUE sym, VALUE val)
 {
    MagickEnum *magick_enum;
 
@@ -2834,7 +2905,8 @@ VALUE Enum_initialize(VALUE self, VALUE sym, VALUE val)
     Method:  Enum#to_s
     Purpose: Return the name of an enum
 */
-VALUE Enum_to_s(VALUE self)
+VALUE
+Enum_to_s(VALUE self)
 {
    MagickEnum *magick_enum;
 
@@ -2847,7 +2919,8 @@ VALUE Enum_to_s(VALUE self)
     Method:  Enum#to_i
     Purpose: Return the value of an enum
 */
-VALUE Enum_to_i(VALUE self)
+VALUE
+Enum_to_i(VALUE self)
 {
    MagickEnum *magick_enum;
 
@@ -2862,7 +2935,8 @@ VALUE Enum_to_i(VALUE self)
     Returns: -1, 0, 1, or nil
     Notes:   Enums must be instances of the same class to be equal.
 */
-VALUE Enum_spaceship(VALUE self, VALUE other)
+VALUE
+Enum_spaceship(VALUE self, VALUE other)
 {
     MagickEnum *this, *that;
 
@@ -2890,7 +2964,8 @@ VALUE Enum_spaceship(VALUE self, VALUE other)
     Returns: true or false
     Notes:   Yes, I know "case equal" is a misnomer.
 */
-VALUE Enum_case_eq(VALUE self, VALUE other)
+VALUE
+Enum_case_eq(VALUE self, VALUE other)
 {
     MagickEnum *this, *that;
 
@@ -2909,7 +2984,8 @@ VALUE Enum_case_eq(VALUE self, VALUE other)
  *  Method:     xxx#initialize
  *  Purpose:    initialize method for all Enum subclasses
 */
-VALUE Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
+VALUE
+Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
 {
     VALUE super_argv[2];
     volatile VALUE enumerators;
@@ -2934,7 +3010,8 @@ VALUE Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
  *  Method:     xxx#inspect
  *  Purpose:    Enum subclass #inspect
 */
-static VALUE Enum_type_inspect(VALUE self)
+static VALUE
+Enum_type_inspect(VALUE self)
 {
     char str[100];
     MagickEnum *magick_enum;
@@ -2951,7 +3028,8 @@ static VALUE Enum_type_inspect(VALUE self)
  *  Purpose:    Behaves like #each if a block is present, otherwise like #to_a.
  *  Notes:      defined for each Enum subclass
 */
-static VALUE Enum_type_values(VALUE class)
+static VALUE
+Enum_type_values(VALUE class)
 {
     volatile VALUE enumerators, copy;
     volatile VALUE rv;
@@ -3047,6 +3125,7 @@ StorageType_name(StorageType type)
     return "UndefinedPixel";
 }
 
+
 /*
     Static:     StretchType_name
     Purpose:    Return the string representation of a StretchType value
@@ -3160,6 +3239,7 @@ rm_write_temp_image(Image *image, char *temp_name)
 
 }
 
+
 /*
     External:   delete_temp_image
     Purpose:    Delete the temporary image from the registry
@@ -3187,6 +3267,7 @@ rm_delete_temp_image(char *temp_name)
 #endif
 }
 
+
 /*
     External:   rm_not_implemented
     Purpose:    raise NotImplementedError
@@ -3201,6 +3282,7 @@ rm_not_implemented(void)
             MagickLibVersionText, rb_id2name(THIS_FUNC()));
 }
 
+
 /*
     Static:     rm_magick_error(msg, loc)
     Purpose:    create a new ImageMagickError object and raise an exception
@@ -3259,7 +3341,8 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
     Function:   rm_get_property
     Purpose:    Backport GetImageProperty for pre-6.3.1 versions of ImageMagick
 */
-const char *rm_get_property(const Image *img, const char *property)
+const char *
+rm_get_property(const Image *img, const char *property)
 {
 #if defined(HAVE_GETIMAGEPROPERTY)
     return GetImageProperty(img, property);
@@ -3276,7 +3359,8 @@ const char *rm_get_property(const Image *img, const char *property)
     Function:   rm_set_property
     Purpose:    Backport SetImageProperty for pre-6.3.1 versions of ImageMagick
 */
-MagickBooleanType rm_set_property(Image *image, const char *property, const char *value)
+MagickBooleanType
+rm_set_property(Image *image, const char *property, const char *value)
 {
 #if defined(HAVE_SETIMAGEPROPERTY)
     return SetImageProperty(image, property, value);
@@ -3286,6 +3370,33 @@ MagickBooleanType rm_set_property(Image *image, const char *property, const char
 }
 
 
+/*
+    Function:   rm_get_optional_arguments
+    Purpose:    Collect optional method arguments via Magick::OptionalMethodArguments
+    Notes:      Creates an instance of Magick::OptionalMethodArguments, then yields
+                to a block in the context of the instance.
+*/
+void
+rm_get_optional_arguments(VALUE img)
+{
+  volatile VALUE OptionalMethodArguments;
+  volatile VALUE opt_args;
+  VALUE argv[1];
+
+  // opt_args = Magick::OptionalMethodArguments.new(img)
+  // opt_args.instance_eval { block }
+  if (rb_block_given_p())
+  {
+      OptionalMethodArguments = rb_const_get_from(Module_Magick, rb_intern("OptionalMethodArguments"));
+      argv[0] = img;
+      opt_args = rb_class_new_instance(1, argv, OptionalMethodArguments);
+      (void) rb_obj_instance_eval(0, NULL, opt_args);
+  }
+
+  return;
+}
+
+
 /*
     Function:   rm_exif_by_entry
     Purpose:    replicate old (< 6.3.2) EXIF:* functionality using GetImageProperty
@@ -3522,7 +3633,8 @@ rm_get_geometry(
  *  Notes:      don't trace creation - the clone may not be used as an Image
  *              object. Let the caller do the trace if desired.
  */
-Image *rm_clone_image(Image *image)
+Image *
+rm_clone_image(Image *image)
 {
     Image *clone;
     ExceptionInfo exception;
@@ -3545,7 +3657,8 @@ Image *rm_clone_image(Image *image)
     Purpose:    SetImage(Info)ProgressMonitor exit
     Notes:      ImageMagick's "tag" argument is unused. We pass along the method name instead.
 */
-MagickBooleanType rm_progress_monitor(
+MagickBooleanType
+rm_progress_monitor(
     const char *tag,
     const MagickOffsetType of,
     const MagickSizeType sp,
@@ -3584,7 +3697,7 @@ rm_split(Image *image)
 
     if (!image)
     {
-        rb_bug("RMagick FATAL: unseq called with NULL argument.");
+        rb_bug("RMagick FATAL: split called with NULL argument.");
     }
     while (image)
     {
@@ -3751,7 +3864,8 @@ handle_exception(ExceptionInfo *exception, Image *imglist, ErrorRetention retent
  *  Extern:     rm_ensure_result
  *  Purpose:    RMagick expected a result. If it got NULL instead raise an exception.
  */
-void rm_ensure_result(Image *image)
+void
+rm_ensure_result(Image *image)
 {
     if (!image)
     {