rmagick 3.0.0 → 3.1.0

data/ext/RMagick/rmdraw.c

@@ -151,7 +151,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->fill, fill);
+    Color_to_PixelColor(&draw->info->fill, fill);
     return self;
 }
 
@@ -304,17 +304,17 @@ VALUE
 Draw_font_weight_eq(VALUE self, VALUE weight)
 {
     Draw *draw;
-    WeightType w;
+    size_t w;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
 
     if (FIXNUM_P(weight))
     {
-        w = (WeightType) FIX2INT(weight);
+        w = FIX2INT(weight);
         if (w < 100 || w > 900)
         {
-            rb_raise(rb_eArgError, "invalid font weight (%d given)", w);
+            rb_raise(rb_eArgError, "invalid font weight (%ld given)", w);
         }
         draw->info->weight = w;
     }
@@ -402,19 +402,12 @@ Draw_gravity_eq(VALUE self, VALUE grav)
 VALUE
 Draw_kerning_eq(VALUE self, VALUE kerning)
 {
-#if defined(HAVE_ST_KERNING)
     Draw *draw;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->kerning = NUM2DBL(kerning);
     return self;
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    self = self;
-    kerning = kerning;
-#endif
 }
 
 
@@ -434,19 +427,12 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
 VALUE
 Draw_interline_spacing_eq(VALUE self, VALUE spacing)
 {
-#if defined(HAVE_ST_INTERLINE_SPACING)
     Draw *draw;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->interline_spacing = NUM2DBL(spacing);
     return self;
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    self = self;
-    spacing = spacing;
-#endif
 }
 
 
@@ -466,19 +452,12 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
 VALUE
 Draw_interword_spacing_eq(VALUE self, VALUE spacing)
 {
-#if defined(HAVE_ST_INTERWORD_SPACING)
     Draw *draw;
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
     draw->info->interword_spacing = NUM2DBL(spacing);
     return self;
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    self = self;
-    spacing = spacing;
-#endif
 }
 
 
@@ -594,8 +573,8 @@ Draw_marshal_dump(VALUE self)
     // rb_hash_aset(ddraw, CSTR2SYM("viewbox"), Import_RectangleInfo(&draw->info->viewbox)); internal
     rb_hash_aset(ddraw, CSTR2SYM("affine"), Import_AffineMatrix(&draw->info->affine));
     rb_hash_aset(ddraw, CSTR2SYM("gravity"), INT2FIX(draw->info->gravity));
-    rb_hash_aset(ddraw, CSTR2SYM("fill"), Pixel_from_PixelPacket(&draw->info->fill));
-    rb_hash_aset(ddraw, CSTR2SYM("stroke"), Pixel_from_PixelPacket(&draw->info->stroke));
+    rb_hash_aset(ddraw, CSTR2SYM("fill"), Pixel_from_PixelColor(&draw->info->fill));
+    rb_hash_aset(ddraw, CSTR2SYM("stroke"), Pixel_from_PixelColor(&draw->info->stroke));
     rb_hash_aset(ddraw, CSTR2SYM("stroke_width"), rb_float_new(draw->info->stroke_width));
     // rb_hash_aset(ddraw, CSTR2SYM("gradient"), Qnil);  // not used yet
     rb_hash_aset(ddraw, CSTR2SYM("fill_pattern"), image_to_str(draw->info->fill_pattern));
@@ -622,8 +601,8 @@ Draw_marshal_dump(VALUE self)
     rb_hash_aset(ddraw, CSTR2SYM("pointsize"), rb_float_new(draw->info->pointsize));
     rb_hash_aset(ddraw, CSTR2SYM("density"), MAGICK_STRING_TO_OBJ(draw->info->density));
     rb_hash_aset(ddraw, CSTR2SYM("align"), INT2FIX(draw->info->align));
-    rb_hash_aset(ddraw, CSTR2SYM("undercolor"), Pixel_from_PixelPacket(&draw->info->undercolor));
-    // rb_hash_aset(ddraw, CSTR2SYM("border_color"), Pixel_from_PixelPacket(&draw->info->border_color)); Montage and Polaroid
+    rb_hash_aset(ddraw, CSTR2SYM("undercolor"), Pixel_from_PixelColor(&draw->info->undercolor));
+    // rb_hash_aset(ddraw, CSTR2SYM("border_color"), Pixel_from_PixelColor(&draw->info->border_color)); Montage and Polaroid
     // rb_hash_aset(ddraw, CSTR2SYM("server_name"), MAGICK_STRING_TO_OBJ(draw->info->server_name));
     // rb_hash_aset(ddraw, CSTR2SYM("dash_pattern"), dash_pattern_to_array(draw->info->dash_pattern)); internal
     // rb_hash_aset(ddraw, CSTR2SYM("clip_mask"), MAGICK_STRING_TO_OBJ(draw->info->clip_mask)); internal
@@ -633,16 +612,12 @@ Draw_marshal_dump(VALUE self)
     // rb_hash_aset(ddraw, CSTR2SYM("render"), draw->info->render ? Qtrue : Qfalse); internal
     // rb_hash_aset(ddraw, CSTR2SYM("element_reference"), Qnil);     // not used yet
     // rb_hash_aset(ddraw, CSTR2SYM("debug"), draw->info->debug ? Qtrue : Qfalse);
-#if defined(HAVE_ST_KERNING)
     rb_hash_aset(ddraw, CSTR2SYM("kerning"), rb_float_new(draw->info->kerning));
-#endif
-#if defined(HAVE_ST_INTERWORD_SPACING)
     rb_hash_aset(ddraw, CSTR2SYM("interword_spacing"), rb_float_new(draw->info->interword_spacing));
-#endif
 
     // Non-DrawInfo fields
     rb_hash_aset(ddraw, CSTR2SYM("primitives"), draw->primitives);
-    // rb_hash_aset(ddraw, CSTR2SYM("shadow_color"), Pixel_from_PixelPacket(&draw->shadow_color)); Polaroid-only
+    // rb_hash_aset(ddraw, CSTR2SYM("shadow_color"), Pixel_from_PixelColor(&draw->shadow_color)); Polaroid-only
 
     return ddraw;
 }
@@ -665,7 +640,6 @@ VALUE
 Draw_marshal_load(VALUE self, VALUE ddraw)
 {
     Draw *draw;
-    Pixel *pixel;
     VALUE val;
 
     Data_Get_Struct(self, Draw, draw);
@@ -681,12 +655,10 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     draw->info->gravity = (GravityType) FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("gravity")));
 
     val = rb_hash_aref(ddraw, CSTR2SYM("fill"));
-    Data_Get_Struct(val, Pixel, pixel);
-    draw->info->fill =  *pixel;
+    Color_to_PixelColor(&draw->info->fill, val);
 
     val = rb_hash_aref(ddraw, CSTR2SYM("stroke"));
-    Data_Get_Struct(val, Pixel, pixel);
-    draw->info->stroke = *pixel;
+    Color_to_PixelColor(&draw->info->stroke, val);
 
     draw->info->stroke_width = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("stroke_width")));
     draw->info->fill_pattern = str_to_image(rb_hash_aref(ddraw, CSTR2SYM("fill_pattern")));
@@ -706,17 +678,12 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     draw->info->align = (AlignType) FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("align")));
 
     val = rb_hash_aref(ddraw, CSTR2SYM("undercolor"));
-    Data_Get_Struct(val, Pixel, pixel);
-    draw->info->undercolor = *pixel;
+    Color_to_PixelColor(&draw->info->undercolor, val);
 
     draw->info->clip_units = FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("clip_units")));
     draw->info->opacity = NUM2QUANTUM(rb_hash_aref(ddraw, CSTR2SYM("opacity")));
-#if defined(HAVE_ST_KERNING)
     draw->info->kerning = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("kerning")));
-#endif
-#if defined(HAVE_ST_INTERWORD_SPACING)
     draw->info->interword_spacing = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("interword_spacing")));
-#endif
 
     draw->primitives = rb_hash_aref(ddraw, CSTR2SYM("primitives"));
 
@@ -817,7 +784,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->stroke, stroke);
+    Color_to_PixelColor(&draw->info->stroke, stroke);
     return self;
 }
 
@@ -940,7 +907,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
 
     rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->undercolor, undercolor);
+    Color_to_PixelColor(&draw->info->undercolor, undercolor);
     return self;
 }
 
@@ -1123,11 +1090,9 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case BlendCompositeOp:
                 op = "Blend";
                 break;
-#if defined(HAVE_ENUM_BLURCOMPOSITEOP)
             case BlurCompositeOp:
                 op = "Blur";
                 break;
-#endif
             case BumpmapCompositeOp:
                 op = "Bumpmap";
                 break;
@@ -1146,15 +1111,15 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case ColorizeCompositeOp:
                 op = "Colorize";
                 break;
-            case CopyCompositeOp:
-                op = "Copy";
-                break;
             case CopyBlackCompositeOp:
                 op = "CopyBlack";
                 break;
             case CopyBlueCompositeOp:
                 op = "CopyBlue";
                 break;
+            case CopyCompositeOp:
+                op = "Copy";
+                break;
             case CopyCyanCompositeOp:
                 op = "CopyCyan";
                 break;
@@ -1176,14 +1141,18 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case DarkenCompositeOp:
                 op = "Darken";
                 break;
-#if defined(HAVE_ENUM_DISTORTCOMPOSITEOP)
+            case DarkenIntensityCompositeOp:
+                op = "DarkenIntensity";
+                break;
             case DistortCompositeOp:
                 op = "Distort";
                 break;
-#endif
             case DivideCompositeOp:
                 op = "Divide";
                 break;
+            case DivideSrcCompositeOp:
+                op = "DivideSrc";
+                break;
             case DstCompositeOp:
                 op = "Dst";
                 break;
@@ -1214,6 +1183,11 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case HardLightCompositeOp:
                 op = "HardLight";
                 break;
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+            case HardMixCompositeOp:
+                op = "HardMix";
+                break;
+#endif
             case HueCompositeOp:
                 op = "Hue";
                 break;
@@ -1223,31 +1197,39 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case LightenCompositeOp:
                 op = "Lighten";
                 break;
-#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP)
+            case LightenIntensityCompositeOp:
+                op = "LightenIntensity";
+                break;
             case LinearBurnCompositeOp:
                 op = "LinearBurn";
                 break;
-#endif
-#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP)
             case LinearDodgeCompositeOp:
                 op = "LinearDodge";
                 break;
-#endif
             case LinearLightCompositeOp:
                 op = "LinearLight";
                 break;
             case LuminizeCompositeOp:
                 op = "Luminize";
                 break;
+            case MathematicsCompositeOp:
+                op = "Mathematics";
+                break;
             case MinusCompositeOp:
                 op = "Minus";
                 break;
+            case MinusSrcCompositeOp:
+                op = "MinusSrc";
+                break;
             case ModulateCompositeOp:
                 op = "Modulate";
                 break;
             case MultiplyCompositeOp:
                 op = "Multiply";
                 break;
+            case NoCompositeOp:
+                op = "No";
+                break;
             case OutCompositeOp:
                 op = "Out";
                 break;
@@ -1257,16 +1239,12 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case OverlayCompositeOp:
                 op = "Overlay";
                 break;
-#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP)
             case PegtopLightCompositeOp:
                 op = "PegtopLight";
                 break;
-#endif
-#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP)
             case PinLightCompositeOp:
                 op = "PinLight";
                 break;
-#endif
             case PlusCompositeOp:
                 op = "Plus";
                 break;
@@ -1303,11 +1281,12 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case ThresholdCompositeOp:
                 op = "Threshold";
                 break;
-#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP)
+            case UndefinedCompositeOp:
+                op = "Undefined";
+                break;
             case VividLightCompositeOp:
                 op = "VividLight";
                 break;
-#endif
             case XorCompositeOp:
                 op = "Xor";
                 break;
@@ -1794,9 +1773,9 @@ PolaroidOptions_initialize(VALUE self)
     Data_Get_Struct(self, Draw, draw);
 
     exception = AcquireExceptionInfo();
-    (void) QueryColorDatabase("gray75", &draw->shadow_color, exception);
+    (void) QueryColorCompliance("gray75", AllCompliance, &draw->shadow_color, exception);
     CHECK_EXCEPTION()
-    (void) QueryColorDatabase("#dfdfdf", &draw->info->border_color, exception);
+    (void) QueryColorCompliance("#dfdfdf", AllCompliance, &draw->info->border_color, exception);
     CHECK_EXCEPTION()
     DestroyExceptionInfo(exception);
 
@@ -1838,8 +1817,9 @@ PolaroidOptions_shadow_color_eq(VALUE self, VALUE shadow)
 {
     Draw *draw;
 
+    rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->shadow_color, shadow);
+    Color_to_PixelColor(&draw->shadow_color, shadow);
     return self;
 }
 
@@ -1859,8 +1839,9 @@ PolaroidOptions_border_color_eq(VALUE self, VALUE border)
 {
     Draw *draw;
 
+    rb_check_frozen(self);
     Data_Get_Struct(self, Draw, draw);
-    Color_to_PixelPacket(&draw->info->border_color, border);
+    Color_to_PixelColor(&draw->info->border_color, border);
     return self;
 }
 
@@ -1889,12 +1870,13 @@ get_dummy_tm_img(VALUE klass)
         {
             rb_raise(rb_eNoMemError, "not enough memory to continue");
         }
-        image = AcquireImage(info);
+        image = rm_acquire_image(info);
+        (void) DestroyImageInfo(info);
+
         if (!image)
         {
             rb_raise(rb_eNoMemError, "not enough memory to continue");
         }
-        (void) DestroyImageInfo(info);
         dummy_img = rm_image_new(image);
 
         rb_cv_set(klass, DUMMY_IMG_CLASS_VAR, dummy_img);

data/ext/RMagick/rmenum.c

@@ -14,6 +14,8 @@
 
 
 #define ENUMERATORS_CLASS_VAR "@@enumerators"
+#define ENUM_TO_NAME(_enum) case _enum: return #_enum;
+#define ENUM_SET_NAME(_enum) case _enum: name = #_enum; break;
 
 
 static VALUE Enum_type_values(VALUE);
@@ -375,16 +377,10 @@ ClassType_new(ClassType cls)
 
     switch(cls)
     {
+        ENUM_SET_NAME(DirectClass)
+        ENUM_SET_NAME(PseudoClass)
         default:
-        case UndefinedClass:
-            name = "UndefineClass";
-            break;
-        case DirectClass:
-            name = "DirectClass";
-            break;
-        case PseudoClass:
-            name = "PseudoClass";
-            break;
+        ENUM_SET_NAME(UndefinedClass)
     }
 
     return rm_enum_new(Class_ClassType, ID2SYM(rb_intern(name)), INT2FIX(cls));
@@ -406,76 +402,39 @@ ColorspaceType_new(ColorspaceType cs)
 
     switch(cs)
     {
+        ENUM_SET_NAME(RGBColorspace)
+        ENUM_SET_NAME(GRAYColorspace)
+        ENUM_SET_NAME(TransparentColorspace)
+        ENUM_SET_NAME(OHTAColorspace)
+        ENUM_SET_NAME(XYZColorspace)
+        ENUM_SET_NAME(YCbCrColorspace)
+        ENUM_SET_NAME(YCCColorspace)
+        ENUM_SET_NAME(YIQColorspace)
+        ENUM_SET_NAME(YPbPrColorspace)
+        ENUM_SET_NAME(YUVColorspace)
+        ENUM_SET_NAME(CMYKColorspace)
+        ENUM_SET_NAME(sRGBColorspace)
+        ENUM_SET_NAME(Rec601YCbCrColorspace)
+        ENUM_SET_NAME(Rec601LumaColorspace)
+        ENUM_SET_NAME(Rec709LumaColorspace)
+        ENUM_SET_NAME(Rec709YCbCrColorspace)
+        ENUM_SET_NAME(CMYColorspace)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUM_SET_NAME(LuvColorspace)
+        ENUM_SET_NAME(HCLColorspace)
+        ENUM_SET_NAME(LCHColorspace)
+        ENUM_SET_NAME(LMSColorspace)
+        ENUM_SET_NAME(LCHabColorspace)
+        ENUM_SET_NAME(LCHuvColorspace)
+        ENUM_SET_NAME(scRGBColorspace)
+        ENUM_SET_NAME(HSIColorspace)
+        ENUM_SET_NAME(HSVColorspace)
+        ENUM_SET_NAME(HCLpColorspace)
+        ENUM_SET_NAME(YDbDrColorspace)
+        ENUM_SET_NAME(xyYColorspace)
+#endif
         default:
-        case UndefinedColorspace:
-            name = "UndefinedColorspace";
-            break;
-        case RGBColorspace:
-            name = "RGBColorspace";
-            break;
-        case GRAYColorspace:
-            name = "GRAYColorspace";
-            break;
-        case TransparentColorspace:
-            name = "TransparentColorspace";
-            break;
-        case OHTAColorspace:
-            name = "OHTAColorspace";
-            break;
-        case XYZColorspace:
-            name = "XYZColorspace";
-            break;
-        case YCbCrColorspace:
-            name = "YCbCrColorspace";
-            break;
-        case YCCColorspace:
-            name = "YCCColorspace";
-            break;
-        case YIQColorspace:
-            name = "YIQColorspace";
-            break;
-        case YPbPrColorspace:
-            name = "YPbPrColorspace";
-            break;
-        case YUVColorspace:
-            name = "YUVColorspace";
-            break;
-        case CMYKColorspace:
-            name = "CMYKColorspace";
-            break;
-        case sRGBColorspace:
-            name = "sRGBColorspace";
-            break;
-        case HSLColorspace:
-            name = "HSLColorspace";
-            break;
-        case HWBColorspace:
-            name = "HWBColorspace";
-            break;
-        case HSBColorspace:
-            name = "HSBColorspace";
-            break;
-        case LabColorspace:
-            name = "LabColorspace";
-            break;
-        case Rec601YCbCrColorspace:
-            name = "Rec601YCbCrColorspace";
-            break;
-        case Rec601LumaColorspace:
-            name = "Rec601LumaColorspace";
-            break;
-        case Rec709LumaColorspace:
-            name = "Rec709LumaColorspace";
-            break;
-        case Rec709YCbCrColorspace:
-            name = "Rec709YCbCrColorspace";
-            break;
-        case LogColorspace:
-            name = "LogColorspace";
-            break;
-        case CMYColorspace:
-            name = "CMYColorspace";
-            break;
+        ENUM_SET_NAME(UndefinedColorspace)
     }
 
     return rm_enum_new(Class_ColorspaceType, ID2SYM(rb_intern(name)), INT2FIX(cs));
@@ -483,6 +442,76 @@ ColorspaceType_new(ColorspaceType cs)
 }
 
 
+/**
+ * Return the string representation of a ComplianceType value.
+ *
+ * No Ruby usage (internal function)
+ *
+ * Notes:
+ *   - xMagick will OR multiple compliance types so we have to arbitrarily pick
+ *     one name.
+ *   - Set the compliance argument to the selected value.
+ *
+ * @param c the ComplianceType value
+ * @return the string
+ */
+const char *
+ComplianceType_name(ComplianceType *c)
+{
+    if ((*c & (SVGCompliance|X11Compliance|XPMCompliance))
+        == (SVGCompliance|X11Compliance|XPMCompliance))
+    {
+        return "AllCompliance";
+    }
+    else if (*c & SVGCompliance)
+    {
+        *c = SVGCompliance;
+        return "SVGCompliance";
+    }
+    else if (*c & X11Compliance)
+    {
+        *c = X11Compliance;
+        return "X11Compliance";
+    }
+    else if (*c & XPMCompliance)
+    {
+        *c = XPMCompliance;
+        return "XPMCompliance";
+    }
+    else if (*c == NoCompliance)
+    {
+        *c = NoCompliance;
+        return "NoCompliance";
+    }
+    else
+    {
+        *c = UndefinedCompliance;
+        return "UndefinedCompliance";
+    }
+}
+
+
+/**
+ * Construct a ComplianceType enum object for the specified value.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param compliance the C ComplianceType value
+ * @return the Ruby ComplianceType enum object
+ */
+VALUE
+ComplianceType_new(ComplianceType compliance)
+{
+    const char *name;
+
+    // Turn off undefined bits
+    compliance &= (SVGCompliance|X11Compliance|XPMCompliance);
+    name = ComplianceType_name(&compliance);
+    return rm_enum_new(Class_ComplianceType, ID2SYM(rb_intern(name)), INT2FIX(compliance));
+}
+
+
+
 /**
  * Return the name of a CompositeOperator enum as a string.
  *
@@ -496,22 +525,15 @@ CompositeOperator_name(CompositeOperator op)
 {
     switch (op)
     {
-        ENUM_TO_NAME(UndefinedCompositeOp)
-        ENUM_TO_NAME(NoCompositeOp)
         ENUM_TO_NAME(AddCompositeOp)
         ENUM_TO_NAME(AtopCompositeOp)
-#if defined(HAVE_ENUM_BLURCOMPOSITEOP)
+        ENUM_TO_NAME(BlendCompositeOp)
         ENUM_TO_NAME(BlurCompositeOp)
-#endif
         ENUM_TO_NAME(BumpmapCompositeOp)
         ENUM_TO_NAME(ChangeMaskCompositeOp)
         ENUM_TO_NAME(ClearCompositeOp)
         ENUM_TO_NAME(ColorBurnCompositeOp)
-        ENUM_TO_NAME(BlendCompositeOp)
         ENUM_TO_NAME(ColorDodgeCompositeOp)
-        ENUM_TO_NAME(ExclusionCompositeOp)
-        ENUM_TO_NAME(HardLightCompositeOp)
-        ENUM_TO_NAME(SoftLightCompositeOp)
         ENUM_TO_NAME(ColorizeCompositeOp)
         ENUM_TO_NAME(CopyBlueCompositeOp)
         ENUM_TO_NAME(CopyCompositeOp)
@@ -523,10 +545,10 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(CopyOpacityCompositeOp)
         ENUM_TO_NAME(CopyRedCompositeOp)
         ENUM_TO_NAME(DarkenCompositeOp)
-#if defined(HAVE_ENUM_DISTORTCOMPOSITEOP)
+        ENUM_TO_NAME(DarkenIntensityCompositeOp)
         ENUM_TO_NAME(DistortCompositeOp)
-#endif
         ENUM_TO_NAME(DivideCompositeOp)
+        ENUM_TO_NAME(DivideSrcCompositeOp)
         ENUM_TO_NAME(DstAtopCompositeOp)
         ENUM_TO_NAME(DstCompositeOp)
         ENUM_TO_NAME(DstInCompositeOp)
@@ -535,36 +557,35 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(DifferenceCompositeOp)
         ENUM_TO_NAME(DisplaceCompositeOp)
         ENUM_TO_NAME(DissolveCompositeOp)
+        ENUM_TO_NAME(ExclusionCompositeOp)
+        ENUM_TO_NAME(HardLightCompositeOp)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUM_TO_NAME(HardMixCompositeOp)
+#endif
         ENUM_TO_NAME(HueCompositeOp)
         ENUM_TO_NAME(InCompositeOp)
         ENUM_TO_NAME(LightenCompositeOp)
-#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP)
+        ENUM_TO_NAME(LightenIntensityCompositeOp)
         ENUM_TO_NAME(LinearBurnCompositeOp)
-#endif
-#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP)
         ENUM_TO_NAME(LinearDodgeCompositeOp)
-#endif
         ENUM_TO_NAME(LinearLightCompositeOp)
         ENUM_TO_NAME(LuminizeCompositeOp)
-#if defined(HAVE_ENUM_MATHEMATICSCOMPOSITEOP)
         ENUM_TO_NAME(MathematicsCompositeOp)
-#endif
         ENUM_TO_NAME(MinusCompositeOp)
+        ENUM_TO_NAME(MinusSrcCompositeOp)
         ENUM_TO_NAME(ModulateCompositeOp)
         ENUM_TO_NAME(MultiplyCompositeOp)
+        ENUM_TO_NAME(NoCompositeOp)
         ENUM_TO_NAME(OutCompositeOp)
         ENUM_TO_NAME(OverCompositeOp)
         ENUM_TO_NAME(OverlayCompositeOp)
-#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP)
         ENUM_TO_NAME(PegtopLightCompositeOp)
-#endif
-#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP)
         ENUM_TO_NAME(PinLightCompositeOp)
-#endif
         ENUM_TO_NAME(PlusCompositeOp)
         ENUM_TO_NAME(ReplaceCompositeOp)
         ENUM_TO_NAME(SaturateCompositeOp)
         ENUM_TO_NAME(ScreenCompositeOp)
+        ENUM_TO_NAME(SoftLightCompositeOp)
         ENUM_TO_NAME(SrcAtopCompositeOp)
         ENUM_TO_NAME(SrcCompositeOp)
         ENUM_TO_NAME(SrcInCompositeOp)
@@ -572,13 +593,11 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(SrcOverCompositeOp)
         ENUM_TO_NAME(SubtractCompositeOp)
         ENUM_TO_NAME(ThresholdCompositeOp)
-#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP)
         ENUM_TO_NAME(VividLightCompositeOp)
-#endif
         ENUM_TO_NAME(XorCompositeOp)
+        default:
+        ENUM_TO_NAME(UndefinedCompositeOp)
     }
-
-    return "UndefinedCompositeOp";
 }
 
 
@@ -611,44 +630,30 @@ CompressionType_name(CompressionType ct)
 {
     switch (ct)
     {
-        ENUM_TO_NAME(UndefinedCompression)
         ENUM_TO_NAME(NoCompression)
-#if defined(HAVE_ENUM_B44COMPRESSION)
         ENUM_TO_NAME(B44Compression)
-#endif
-#if defined(HAVE_ENUM_B44ACOMPRESSION)
         ENUM_TO_NAME(B44ACompression)
-#endif
         ENUM_TO_NAME(BZipCompression)
-#if defined(HAVE_ENUM_DXT1COMPRESSION)
         ENUM_TO_NAME(DXT1Compression)
-#endif
-#if defined(HAVE_ENUM_DXT3COMPRESSION)
         ENUM_TO_NAME(DXT3Compression)
-#endif
-#if defined(HAVE_ENUM_DXT5COMPRESSION)
         ENUM_TO_NAME(DXT5Compression)
-#endif
         ENUM_TO_NAME(FaxCompression)
         ENUM_TO_NAME(Group4Compression)
         ENUM_TO_NAME(JPEGCompression)
         ENUM_TO_NAME(JPEG2000Compression)
         ENUM_TO_NAME(LosslessJPEGCompression)
         ENUM_TO_NAME(LZWCompression)
-#if defined(HAVE_ENUM_PIZCOMPRESSION)
         ENUM_TO_NAME(PizCompression)
-#endif
-#if defined(HAVE_ENUM_PXR24COMPRESSION)
         ENUM_TO_NAME(Pxr24Compression)
-#endif
         ENUM_TO_NAME(RLECompression)
         ENUM_TO_NAME(ZipCompression)
-#if defined(HAVE_ENUM_ZIPSCOMPRESSION)
         ENUM_TO_NAME(ZipSCompression)
-#endif
-        }
-
-    return "UndefinedCompression";
+        ENUM_TO_NAME(LZMACompression)
+        ENUM_TO_NAME(JBIG1Compression)
+        ENUM_TO_NAME(JBIG2Compression)
+        default:
+        ENUM_TO_NAME(UndefinedCompression)
+    }
 }
 
 
@@ -681,13 +686,12 @@ DisposeType_name(DisposeType type)
 {
     switch(type)
     {
-        ENUM_TO_NAME(UndefinedDispose)
         ENUM_TO_NAME(BackgroundDispose)
         ENUM_TO_NAME(NoneDispose)
         ENUM_TO_NAME(PreviousDispose)
+        default:
+        ENUM_TO_NAME(UndefinedDispose)
     }
-
-    return "UndefinedDispose";
 }
 
 
@@ -707,6 +711,43 @@ DisposeType_new(DisposeType type)
 }
 
 
+/**
+ * Return the name of a EndianType enum as a string.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param type the EndianType
+ * @return the name
+ */
+static const char *
+EndianType_name(EndianType type)
+{
+    switch(type)
+    {
+        ENUM_TO_NAME(LSBEndian)
+        ENUM_TO_NAME(MSBEndian)
+        default:
+        ENUM_TO_NAME(UndefinedEndian)
+    }
+}
+
+
+/**
+ * Construct an EndianType enum object.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param type the EndianType
+ * @return a new EndianType enumerator
+ */
+VALUE
+EndianType_new(EndianType type)
+{
+    const char *name = EndianType_name(type);
+    return rm_enum_new(Class_EndianType, ID2SYM(rb_intern(name)), INT2FIX(type));
+}
+
+
 /**
  * Return the name of a FilterTypes enum as a string.
  *
@@ -720,7 +761,6 @@ FilterTypes_name(FilterTypes type)
 {
     switch(type)
     {
-        ENUM_TO_NAME(UndefinedFilter)
         ENUM_TO_NAME(PointFilter)
         ENUM_TO_NAME(BoxFilter)
         ENUM_TO_NAME(TriangleFilter)
@@ -736,32 +776,27 @@ FilterTypes_name(FilterTypes type)
         ENUM_TO_NAME(LanczosFilter)
         ENUM_TO_NAME(BesselFilter)
         ENUM_TO_NAME(SincFilter)
-#if defined(HAVE_ENUM_KAISERFILTER)
         ENUM_TO_NAME(KaiserFilter)
-#endif
-#if defined(HAVE_ENUM_WELSHFILTER)
         ENUM_TO_NAME(WelshFilter)
-#endif
-#if defined(HAVE_ENUM_PARZENFILTER)
         ENUM_TO_NAME(ParzenFilter)
-#endif
-#if defined(HAVE_ENUM_LAGRANGEFILTER)
         ENUM_TO_NAME(LagrangeFilter)
-#endif
-#if defined(HAVE_ENUM_BOHMANFILTER)
         ENUM_TO_NAME(BohmanFilter)
-#endif
-#if defined(HAVE_ENUM_BARTLETTFILTER)
         ENUM_TO_NAME(BartlettFilter)
+        // ENUM_TO_NAME(JincFilter) is alias of BesselFilter
+        ENUM_TO_NAME(SincFastFilter)
+        ENUM_TO_NAME(LanczosSharpFilter)
+        ENUM_TO_NAME(Lanczos2Filter)
+        ENUM_TO_NAME(Lanczos2SharpFilter)
+        ENUM_TO_NAME(RobidouxFilter)
+        ENUM_TO_NAME(RobidouxSharpFilter)
+        ENUM_TO_NAME(CosineFilter)
+        ENUM_TO_NAME(SplineFilter)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUM_TO_NAME(LanczosRadiusFilter)
 #endif
-#if defined(HAVE_ENUM_SENTINELFILTER)
-        // not a real filter name - defeat gcc warning message
-        case SentinelFilter:
-            break;
-#endif
+        default:
+        ENUM_TO_NAME(UndefinedFilter)
     }
-
-    return "UndefinedFilter";
 }
 
 
@@ -782,86 +817,98 @@ FilterTypes_new(FilterTypes type)
 
 
 /**
- * Return the name of a EndianType enum as a string.
+ * Return the name of a GravityType enum as a string.
  *
  * No Ruby usage (internal function)
  *
- * @param type the EndianType
+ * @param type the GravityType
  * @return the name
  */
 static const char *
-EndianType_name(EndianType type)
+GravityType_name(GravityType type)
 {
     switch(type)
     {
-        ENUM_TO_NAME(UndefinedEndian)
-        ENUM_TO_NAME(LSBEndian)
-        ENUM_TO_NAME(MSBEndian)
+        ENUM_TO_NAME(NorthWestGravity)
+        ENUM_TO_NAME(NorthGravity)
+        ENUM_TO_NAME(NorthEastGravity)
+        ENUM_TO_NAME(WestGravity)
+        ENUM_TO_NAME(CenterGravity)
+        ENUM_TO_NAME(EastGravity)
+        ENUM_TO_NAME(SouthWestGravity)
+        ENUM_TO_NAME(SouthGravity)
+        ENUM_TO_NAME(SouthEastGravity)
+        ENUM_TO_NAME(StaticGravity)
+        default:
+        ENUM_TO_NAME(UndefinedGravity)
     }
-    return "UndefinedEndian";
 }
 
 
 /**
- * Construct an EndianType enum object.
+ * Construct an GravityType enum object for the specified value.
  *
  * No Ruby usage (internal function)
  *
- * @param type the EndianType
- * @return a new EndianType enumerator
+ * @param type the GravityType
+ * @return a new GravityType enumerator
  */
 VALUE
-EndianType_new(EndianType type)
+GravityType_new(GravityType type)
 {
-    const char *name = EndianType_name(type);
-    return rm_enum_new(Class_EndianType, ID2SYM(rb_intern(name)), INT2FIX(type));
+    const char *name = GravityType_name(type);
+    return rm_enum_new(Class_GravityType, ID2SYM(rb_intern(name)), INT2FIX(type));
 }
 
 
 /**
- * Return the name of a GravityType enum as a string.
+ * Return the name of a ImageLayerMethod enum as a string.
  *
  * No Ruby usage (internal function)
  *
- * @param type the GravityType
+ * @param method the ImageLayerMethod
  * @return the name
  */
 static const char *
-GravityType_name(GravityType type)
+ImageLayerMethod_name(ImageLayerMethod method)
 {
-    switch(type)
+    switch(method)
     {
-        ENUM_TO_NAME(ForgetGravity)
-        ENUM_TO_NAME(NorthWestGravity)
-        ENUM_TO_NAME(NorthGravity)
-        ENUM_TO_NAME(NorthEastGravity)
-        ENUM_TO_NAME(WestGravity)
-        ENUM_TO_NAME(CenterGravity)
-        ENUM_TO_NAME(EastGravity)
-        ENUM_TO_NAME(SouthWestGravity)
-        ENUM_TO_NAME(SouthGravity)
-        ENUM_TO_NAME(SouthEastGravity)
-        ENUM_TO_NAME(StaticGravity)
+        ENUM_TO_NAME(CompareAnyLayer)
+        ENUM_TO_NAME(CompareClearLayer)
+        ENUM_TO_NAME(CompareOverlayLayer)
+        ENUM_TO_NAME(OptimizeLayer)
+        ENUM_TO_NAME(OptimizePlusLayer)
+        ENUM_TO_NAME(CoalesceLayer)
+        ENUM_TO_NAME(DisposeLayer)
+        ENUM_TO_NAME(OptimizeTransLayer)
+        ENUM_TO_NAME(OptimizeImageLayer)
+        ENUM_TO_NAME(RemoveDupsLayer)
+        ENUM_TO_NAME(RemoveZeroLayer)
+        ENUM_TO_NAME(CompositeLayer)
+        ENUM_TO_NAME(MergeLayer)
+        ENUM_TO_NAME(MosaicLayer)
+        ENUM_TO_NAME(FlattenLayer)
+        ENUM_TO_NAME(TrimBoundsLayer)
+        default:
+        ENUM_TO_NAME(UndefinedLayer)
     }
-
-    // Defeat "duplicate case value" error.
-    return "UndefinedGravity";
 }
 
 
 /**
- * Construct an GravityType enum object for the specified value.
+ * Construct an ImageLayerMethod enum object for the specified value.
  *
  * No Ruby usage (internal function)
  *
- * @param type the GravityType
- * @return a new GravityType enumerator
+ * @param method the ImageLayerMethod
+ * @return a new ImageLayerMethod enumerator
  */
 VALUE
-GravityType_new(GravityType type)
+ImageLayerMethod_new(ImageLayerMethod method)
 {
-    const char *name = GravityType_name(type);
-    return rm_enum_new(Class_GravityType, ID2SYM(rb_intern(name)), INT2FIX(type));
+    const char *name = ImageLayerMethod_name(method);
+    return rm_enum_new(Class_ImageLayerMethod, ID2SYM(rb_intern(name)), INT2FIX(method));
 }
 
 
@@ -878,7 +925,6 @@ ImageType_name(ImageType type)
 {
     switch(type)
     {
-        ENUM_TO_NAME(UndefinedType)
         ENUM_TO_NAME(BilevelType)
         ENUM_TO_NAME(GrayscaleType)
         ENUM_TO_NAME(GrayscaleMatteType)
@@ -890,9 +936,9 @@ ImageType_name(ImageType type)
         ENUM_TO_NAME(ColorSeparationMatteType)
         ENUM_TO_NAME(OptimizeType)
         ENUM_TO_NAME(PaletteBilevelMatteType)
+        default:
+        ENUM_TO_NAME(UndefinedType)
     }
-
-    return "UndefinedType";
 }
 
 
@@ -925,7 +971,6 @@ InterlaceType_name(InterlaceType interlace)
 {
     switch(interlace)
     {
-        ENUM_TO_NAME(UndefinedInterlace)
         ENUM_TO_NAME(GIFInterlace)
         ENUM_TO_NAME(JPEGInterlace)
         ENUM_TO_NAME(PNGInterlace)
@@ -933,9 +978,9 @@ InterlaceType_name(InterlaceType interlace)
         ENUM_TO_NAME(LineInterlace)
         ENUM_TO_NAME(PlaneInterlace)
         ENUM_TO_NAME(PartitionInterlace)
+        default:
+        ENUM_TO_NAME(UndefinedInterlace)
     }
-
-    return "UndefinedInterlace";
 }
 
 
@@ -968,7 +1013,6 @@ InterpolatePixelMethod_name(InterpolatePixelMethod interpolate)
 {
     switch(interpolate)
     {
-        ENUM_TO_NAME(UndefinedInterpolatePixel)
         ENUM_TO_NAME(AverageInterpolatePixel)
         ENUM_TO_NAME(BicubicInterpolatePixel)
         ENUM_TO_NAME(BilinearInterpolatePixel)
@@ -977,9 +1021,14 @@ InterpolatePixelMethod_name(InterpolatePixelMethod interpolate)
         ENUM_TO_NAME(MeshInterpolatePixel)
         ENUM_TO_NAME(NearestNeighborInterpolatePixel)
         ENUM_TO_NAME(SplineInterpolatePixel)
+        ENUM_TO_NAME(Average9InterpolatePixel)
+        ENUM_TO_NAME(Average16InterpolatePixel)
+        ENUM_TO_NAME(BlendInterpolatePixel)
+        ENUM_TO_NAME(BackgroundInterpolatePixel)
+        ENUM_TO_NAME(CatromInterpolatePixel)
+        default:
+        ENUM_TO_NAME(UndefinedInterpolatePixel)
     }
-
-    return "UndefinedInterpolatePixel";
 }
 
 
@@ -999,66 +1048,6 @@ InterpolatePixelMethod_new(InterpolatePixelMethod interpolate)
 }
 
 
-/**
- * Return the name of a MagickLayerMethod enum as a string.
- *
- * No Ruby usage (internal function)
- *
- * @param method the MagickLayerMethod
- * @return the name
- */
-static const char *
-LAYERMETHODTYPE_NAME(LAYERMETHODTYPE method)
-{
-    switch(method)
-    {
-        ENUM_TO_NAME(UndefinedLayer)
-        ENUM_TO_NAME(CompareAnyLayer)
-        ENUM_TO_NAME(CompareClearLayer)
-        ENUM_TO_NAME(CompareOverlayLayer)
-        ENUM_TO_NAME(OptimizeLayer)
-        ENUM_TO_NAME(OptimizePlusLayer)
-        ENUM_TO_NAME(CoalesceLayer)
-        ENUM_TO_NAME(DisposeLayer)
-        ENUM_TO_NAME(OptimizeTransLayer)
-        ENUM_TO_NAME(OptimizeImageLayer)
-        ENUM_TO_NAME(RemoveDupsLayer)
-        ENUM_TO_NAME(RemoveZeroLayer)
-        ENUM_TO_NAME(CompositeLayer)
-#if defined(HAVE_ENUM_MERGELAYER)
-        ENUM_TO_NAME(MergeLayer)
-#endif
-#if defined(HAVE_ENUM_MOSAICLAYER)
-        ENUM_TO_NAME(MosaicLayer)
-#endif
-#if defined(HAVE_ENUM_FLATTENLAYER)
-        ENUM_TO_NAME(FlattenLayer)
-#endif
-#if defined(HAVE_ENUM_TRIMBOUNDSLAYER)
-        ENUM_TO_NAME(TrimBoundsLayer)
-#endif
-    }
-
-    return "UndefinedLayer";
-}
-
-
-/**
- * Construct an MagickLayerMethod enum object for the specified value.
- *
- * No Ruby usage (internal function)
- *
- * @param method the MagickLayerMethod
- * @return a new MagickLayerMethod enumerator
- */
-VALUE
-LAYERMETHODTYPE_NEW(LAYERMETHODTYPE method)
-{
-    const char *name = LAYERMETHODTYPE_NAME(method);
-    return rm_enum_new(CLASS_LAYERMETHODTYPE, ID2SYM(rb_intern(name)), INT2FIX(method));
-}
-
-
 /**
  * Return the name of a OrientationType enum as a string.
  *
@@ -1072,7 +1061,6 @@ OrientationType_name(OrientationType type)
 {
     switch(type)
     {
-        ENUM_TO_NAME(UndefinedOrientation)
         ENUM_TO_NAME(TopLeftOrientation)
         ENUM_TO_NAME(TopRightOrientation)
         ENUM_TO_NAME(BottomRightOrientation)
@@ -1081,9 +1069,9 @@ OrientationType_name(OrientationType type)
         ENUM_TO_NAME(RightTopOrientation)
         ENUM_TO_NAME(RightBottomOrientation)
         ENUM_TO_NAME(LeftBottomOrientation)
+        default:
+        ENUM_TO_NAME(UndefinedOrientation)
     }
-
-    return "UndefinedOrientation";
 }
 
 
@@ -1116,14 +1104,13 @@ RenderingIntent_name(RenderingIntent intent)
 {
     switch(intent)
     {
-        ENUM_TO_NAME(UndefinedIntent)
         ENUM_TO_NAME(SaturationIntent)
         ENUM_TO_NAME(PerceptualIntent)
         ENUM_TO_NAME(AbsoluteIntent)
         ENUM_TO_NAME(RelativeIntent)
+        default:
+        ENUM_TO_NAME(UndefinedIntent)
     }
-
-    return "UndefinedIntent";
 }
 
 
@@ -1156,12 +1143,11 @@ ResolutionType_name(ResolutionType type)
 {
     switch(type)
     {
-        ENUM_TO_NAME(UndefinedResolution)
         ENUM_TO_NAME(PixelsPerInchResolution)
         ENUM_TO_NAME(PixelsPerCentimeterResolution)
+        default:
+        ENUM_TO_NAME(UndefinedResolution)
     }
-
-    return "UndefinedResolution";
 }
 
 
@@ -1194,7 +1180,6 @@ StorageType_name(StorageType type)
 {
     switch (type)
     {
-        ENUM_TO_NAME(UndefinedPixel)
         ENUM_TO_NAME(CharPixel)
         ENUM_TO_NAME(DoublePixel)
         ENUM_TO_NAME(FloatPixel)
@@ -1202,9 +1187,93 @@ StorageType_name(StorageType type)
         ENUM_TO_NAME(LongPixel)
         ENUM_TO_NAME(QuantumPixel)
         ENUM_TO_NAME(ShortPixel)
+        default:
+        ENUM_TO_NAME(UndefinedPixel)
     }
+}
+
 
-    return "UndefinedPixel";
+/**
+ * Return the string representation of a StretchType value.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param stretch the StretchType value
+ * @return the string
+ */
+const char *
+StretchType_name(StretchType stretch)
+{
+    switch (stretch)
+    {
+        ENUM_TO_NAME(NormalStretch)
+        ENUM_TO_NAME(UltraCondensedStretch)
+        ENUM_TO_NAME(ExtraCondensedStretch)
+        ENUM_TO_NAME(CondensedStretch)
+        ENUM_TO_NAME(SemiCondensedStretch)
+        ENUM_TO_NAME(SemiExpandedStretch)
+        ENUM_TO_NAME(ExpandedStretch)
+        ENUM_TO_NAME(ExtraExpandedStretch)
+        ENUM_TO_NAME(UltraExpandedStretch)
+        ENUM_TO_NAME(AnyStretch)
+        default:
+        ENUM_TO_NAME(UndefinedStretch)
+    }
+}
+
+
+/**
+ * Construct a StretchType enum for a specified StretchType value.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param stretch the C StretchType value
+ * @return a Ruby StretchType enum
+ */
+VALUE
+StretchType_new(StretchType stretch)
+{
+    const char *name = StretchType_name(stretch);
+    return rm_enum_new(Class_StretchType, ID2SYM(rb_intern(name)), INT2FIX(stretch));
+}
+
+
+/**
+ * Return the string representation of a StyleType value.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param style the StyleType value
+ * @return the string
+ */
+const char *
+StyleType_name(StyleType style)
+{
+    switch (style)
+    {
+        ENUM_TO_NAME(NormalStyle)
+        ENUM_TO_NAME(ItalicStyle)
+        ENUM_TO_NAME(ObliqueStyle)
+        ENUM_TO_NAME(AnyStyle)
+        default:
+        ENUM_TO_NAME(UndefinedStyle)
+    }
+}
+
+
+/**
+ * Construct a StyleType enum for a specified StyleType value.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param style the C StyleType value
+ * @return a Ruby StyleType enum
+ */
+VALUE
+StyleType_new(StyleType style)
+{
+    const char *name = StyleType_name(style);
+    return rm_enum_new(Class_StyleType, ID2SYM(rb_intern(name)), INT2FIX(style));
 }
 
 
@@ -1221,7 +1290,6 @@ VirtualPixelMethod_name(VirtualPixelMethod method)
 {
     switch (method)
     {
-        ENUM_TO_NAME(UndefinedVirtualPixelMethod)
         ENUM_TO_NAME(EdgeVirtualPixelMethod)
         ENUM_TO_NAME(MirrorVirtualPixelMethod)
         ENUM_TO_NAME(TileVirtualPixelMethod)
@@ -1234,24 +1302,14 @@ VirtualPixelMethod_name(VirtualPixelMethod method)
         ENUM_TO_NAME(BlackVirtualPixelMethod)
         ENUM_TO_NAME(GrayVirtualPixelMethod)
         ENUM_TO_NAME(WhiteVirtualPixelMethod)
-#if defined(HAVE_ENUM_HORIZONTALTILEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(HorizontalTileVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_VERTICALTILEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(VerticalTileVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_HORIZONTALTILEEDGEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(HorizontalTileEdgeVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_VERTICALTILEEDGEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(VerticalTileEdgeVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_CHECKERTILEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(CheckerTileVirtualPixelMethod)
-#endif
+        default:
+        ENUM_TO_NAME(UndefinedVirtualPixelMethod)
     }
-
-    return "UndefinedVirtualPixelMethod";
 }