rmagick 3.0.0 → 3.1.0

data/ext/RMagick/rminfo.c

@@ -13,7 +13,26 @@
 #include "rmagick.h"
 
 
-
+/*
+ *  Define functions to get/set attributes in Image::Info that
+ *  use the Get/SetImageOption API.
+*/
+//! Option attribute reader. For Image::Info.
+#define OPTION_ATTR_READER(opt, key) \
+    VALUE Info_##opt(VALUE self)\
+    {\
+        return get_option(self, #key);\
+    }
+//! Option attribute writer. For Image::Info.
+#define OPTION_ATTR_WRITER(opt, key) \
+    VALUE Info_##opt##_eq(VALUE self, VALUE string)\
+    {\
+        return set_option(self, #key, string);\
+    }
+//! Option attribute accessor. For Image::Info.
+#define OPTION_ATTR_ACCESSOR(opt, key)\
+    OPTION_ATTR_READER(opt, key)\
+    OPTION_ATTR_WRITER(opt, key)
 
 
 /**
@@ -64,7 +83,7 @@ set_option(VALUE self, const char *key, VALUE string)
 
     if (NIL_P(string))
     {
-        (void) RemoveImageOption(info, key);
+        (void) DeleteImageOption(info, key);
     }
     else
     {
@@ -81,7 +100,7 @@ set_option(VALUE self, const char *key, VALUE string)
  * No Ruby usage (internal function)
  *
  * Notes:
- *   - Call QueryColorDatabase to validate color name.
+ *   - Call QueryColorCompliance to validate color name.
  *
  * @param self this object
  * @param option the option
@@ -92,7 +111,7 @@ static VALUE set_color_option(VALUE self, const char *option, VALUE color)
 {
     Info *info;
     char *name;
-    PixelPacket pp;
+    PixelColor pp;
     ExceptionInfo *exception;
     MagickBooleanType okay;
 
@@ -100,20 +119,19 @@ static VALUE set_color_option(VALUE self, const char *option, VALUE color)
 
     if (NIL_P(color))
     {
-        (void) RemoveImageOption(info, option);
+        (void) DeleteImageOption(info, option);
     }
     else
     {
-        exception = AcquireExceptionInfo();
         name = StringValuePtr(color);
-        okay = QueryColorDatabase(name, &pp, exception);
+        exception = AcquireExceptionInfo();
+        okay = QueryColorCompliance(name, AllCompliance, &pp, exception);
         (void) DestroyExceptionInfo(exception);
         if (!okay)
         {
             rb_raise(rb_eArgError, "invalid color name `%s'", name);
         }
 
-        (void) RemoveImageOption(info, option);
         (void) SetImageOption(info, option, name);
     }
 
@@ -179,7 +197,7 @@ static VALUE set_dbl_option(VALUE self, const char *option, VALUE value)
 
     if (NIL_P(value))
     {
-        (void) RemoveImageOption(info, option);
+        (void) DeleteImageOption(info, option);
     }
     else
     {
@@ -194,7 +212,6 @@ static VALUE set_dbl_option(VALUE self, const char *option, VALUE value)
             len = sprintf(buff, "%-10.2f", d);
         }
         memset(buff+len, '\0', sizeof(buff)-len);
-        (void) RemoveImageOption(info, option);
         (void) SetImageOption(info, option, buff);
     }
 
@@ -214,9 +231,9 @@ static VALUE set_dbl_option(VALUE self, const char *option, VALUE value)
  */
 static char *pixel_packet_to_hexname(PixelPacket *pp, char *name)
 {
-    MagickPixelPacket mpp;
+    MagickPixel mpp;
 
-    GetMagickPixelPacket(NULL, &mpp);
+    rm_init_magickpixel(NULL, &mpp);
     rm_set_magick_pixel_packet(pp, &mpp);
     (void) GetColorTuple(&mpp, MagickTrue, name);
     return name;
@@ -356,7 +373,7 @@ Info_aset(int argc, VALUE *argv, VALUE self)
 
     if (NIL_P(value))
     {
-        (void) RemoveImageOption(info, ckey);
+        (void) DeleteImageOption(info, ckey);
     }
     else
     {
@@ -364,7 +381,6 @@ Info_aset(int argc, VALUE *argv, VALUE self)
         value = rm_to_s(value);
         value_p = StringValuePtr(value);
 
-        (void) RemoveImageOption(info, ckey);
         okay = SetImageOption(info, ckey, value_p);
         if (!okay)
         {
@@ -492,7 +508,7 @@ Info_background_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->background_color);
+    return rm_pixelcolor_to_color_name_info(info, &info->background_color);
 }
 
 
@@ -517,7 +533,7 @@ Info_background_color_eq(VALUE self, VALUE bc_arg)
     //char colorname[MaxTextExtent];
 
     Data_Get_Struct(self, Info, info);
-    Color_to_PixelPacket(&info->background_color, bc_arg);
+    Color_to_PixelColor(&info->background_color, bc_arg);
     //SetImageOption(info, "background", pixel_packet_to_hexname(&info->background_color, colorname));
     return self;
 }
@@ -538,7 +554,7 @@ Info_border_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->border_color);
+    return rm_pixelcolor_to_color_name_info(info, &info->border_color);
 }
 
 /**
@@ -562,7 +578,7 @@ Info_border_color_eq(VALUE self, VALUE bc_arg)
     //char colorname[MaxTextExtent];
 
     Data_Get_Struct(self, Info, info);
-    Color_to_PixelPacket(&info->border_color, bc_arg);
+    Color_to_PixelColor(&info->border_color, bc_arg);
     //SetImageOption(info, "bordercolor", pixel_packet_to_hexname(&info->border_color, colorname));
     return self;
 }
@@ -770,7 +786,7 @@ Info_define(int argc, VALUE *argv, VALUE self)
     }
     (void) sprintf(ckey, "%s:%s", format, key);
 
-    (void) RemoveImageOption(info, ckey);
+    (void) DeleteImageOption(info, ckey);
     okay = SetImageOption(info, ckey, value);
     if (!okay)
     {
@@ -859,7 +875,7 @@ Info_delay_eq(VALUE self, VALUE string)
 
     if (NIL_P(string))
     {
-        (void) RemoveImageOption(info, "delay");
+        (void) DeleteImageOption(info, "delay");
     }
     else
     {
@@ -871,7 +887,6 @@ Info_delay_eq(VALUE self, VALUE string)
         }
         delay = NUM2INT(string);
         sprintf(dstr, "%d", delay);
-        (void) RemoveImageOption(info, "delay");
         (void) SetImageOption(info, "delay", dstr);
     }
     return self;
@@ -1092,7 +1107,7 @@ Info_dispose_eq(VALUE self, VALUE disp)
 
     if (NIL_P(disp))
     {
-        (void) RemoveImageOption(info, "dispose");
+        (void) DeleteImageOption(info, "dispose");
         return self;
     }
 
@@ -1401,9 +1416,9 @@ Info_format_eq(VALUE self, VALUE magick)
 
     Data_Get_Struct(self, Info, info);
 
-    exception = AcquireExceptionInfo();
-
     mgk = StringValuePtr(magick);
+
+    exception = AcquireExceptionInfo();
     m = GetMagickInfo(mgk, exception);
     CHECK_EXCEPTION()
     (void) DestroyExceptionInfo(exception);
@@ -1562,7 +1577,7 @@ Info_gravity_eq(VALUE self, VALUE grav)
 
     if (NIL_P(grav))
     {
-        (void) RemoveImageOption(info, "gravity");
+        (void) DeleteImageOption(info, "gravity");
         return self;
     }
 
@@ -1681,7 +1696,7 @@ Info_matte_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->matte_color);
+    return rm_pixelcolor_to_color_name_info(info, &info->matte_color);
 }
 
 /**
@@ -1702,7 +1717,7 @@ Info_matte_color_eq(VALUE self, VALUE matte_arg)
     //char colorname[MaxTextExtent];
 
     Data_Get_Struct(self, Info, info);
-    Color_to_PixelPacket(&info->matte_color, matte_arg);
+    Color_to_PixelColor(&info->matte_color, matte_arg);
     //SetImageOption(info, "mattecolor", pixel_packet_to_hexname(&info->matte_color, colorname));
     return self;
 }
@@ -1734,10 +1749,6 @@ Info_monitor_eq(VALUE self, VALUE monitor)
         (void) SetImageInfoProgressMonitor(info, rm_progress_monitor, (void *)monitor);
     }
 
-#if defined(_WIN32)
-    rb_warn("Info#monitor= does not work on Windows");
-#endif
-
     return self;
 }
 
@@ -1833,7 +1844,7 @@ Info_origin_eq(VALUE self, VALUE origin_arg)
 
     if (NIL_P(origin_arg))
     {
-        (void) RemoveImageOption(info, "origin");
+        (void) DeleteImageOption(info, "origin");
         return self;
     }
 
@@ -2291,7 +2302,7 @@ Info_transparent_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->transparent_color);
+    return rm_pixelcolor_to_color_name_info(info, &info->transparent_color);
 }
 
 
@@ -2313,7 +2324,7 @@ Info_transparent_color_eq(VALUE self, VALUE tc_arg)
     //char colorname[MaxTextExtent];
 
     Data_Get_Struct(self, Info, info);
-    Color_to_PixelPacket(&info->transparent_color, tc_arg);
+    Color_to_PixelColor(&info->transparent_color, tc_arg);
     //SetImageOption(info, "transparent", pixel_packet_to_hexname(&info->transparent_color, colorname));
     return self;
 }
@@ -2377,9 +2388,7 @@ Info_undefine(VALUE self, VALUE format, VALUE key)
     sprintf(fkey, "%.60s:%.*s", format_p, (int)(MaxTextExtent-61), key_p);
 
     Data_Get_Struct(self, Info, info);
-    /* Depending on the IM version, RemoveImageOption returns either */
-    /* char * or MagickBooleanType. Ignore the return value.         */
-    (void) RemoveImageOption(info, fkey);
+    (void) DeleteImageOption(info, fkey);
 
     return self;
 }

data/ext/RMagick/rmkinfo.c

@@ -21,8 +21,8 @@
 static void
 rm_kernel_info_destroy(void *kernel)
 {
-  if (kernel)
-    DestroyKernelInfo((KernelInfo*)kernel);
+    if (kernel)
+      DestroyKernelInfo((KernelInfo*)kernel);
 }
 
 /**
@@ -36,7 +36,7 @@ rm_kernel_info_destroy(void *kernel)
 VALUE
 KernelInfo_alloc(VALUE class)
 {
-  return Data_Wrap_Struct(class, NULL, rm_kernel_info_destroy, NULL);
+    return Data_Wrap_Struct(class, NULL, rm_kernel_info_destroy, NULL);
 }
 
 /**
@@ -52,18 +52,18 @@ KernelInfo_alloc(VALUE class)
 VALUE
 KernelInfo_initialize(VALUE self, VALUE kernel_string)
 {
-  KernelInfo *kernel;
+    KernelInfo *kernel;
 
-  Check_Type(kernel_string, T_STRING);
+    Check_Type(kernel_string, T_STRING);
 
-  kernel = AcquireKernelInfo(StringValueCStr(kernel_string));
+    kernel = AcquireKernelInfo(StringValueCStr(kernel_string));
 
-  if (kernel == NULL)
-    rb_raise(rb_eRuntimeError, "failed to parse kernel string");
+    if (kernel == NULL)
+        rb_raise(rb_eRuntimeError, "failed to parse kernel string");
 
-  DATA_PTR(self) = kernel;
+    DATA_PTR(self) = kernel;
 
-  return self;
+    return self;
 }
 
 /**
@@ -73,12 +73,14 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
  *   - @verbatim KernelInfo#zero_nans @endverbatim
  *
  * @param self this object
+ * @deprecated This method has been deprecated.
  */
 VALUE
 KernelInfo_zero_nans(VALUE self)
 {
-  ZeroKernelNans((KernelInfo*)DATA_PTR(self));
-  return Qnil;
+    rb_warning("KernelInfo#zero_nans is deprecated");
+    ZeroKernelNans((KernelInfo*)DATA_PTR(self));
+    return Qnil;
 }
 
 /**
@@ -93,11 +95,11 @@ KernelInfo_zero_nans(VALUE self)
 VALUE
 KernelInfo_unity_add(VALUE self, VALUE scale)
 {
-  if (!FIXNUM_P(scale))
-    Check_Type(scale, T_FLOAT);
+    if (!FIXNUM_P(scale))
+        Check_Type(scale, T_FLOAT);
 
-  UnityAddKernelInfo((KernelInfo*)DATA_PTR(self), NUM2DBL(scale));
-  return Qnil;
+    UnityAddKernelInfo((KernelInfo*)DATA_PTR(self), NUM2DBL(scale));
+    return Qnil;
 }
 
 /**
@@ -107,12 +109,14 @@ KernelInfo_unity_add(VALUE self, VALUE scale)
  *   - @verbatim KernelInfo#show @endverbatim
  *
  * @param self this object
+ * @deprecated This method has been deprecated.
  */
 VALUE
 KernelInfo_show(VALUE self)
 {
-  ShowKernelInfo((KernelInfo*)DATA_PTR(self));
-  return Qnil;
+    rb_warning("KernelInfo#show is deprecated");
+    ShowKernelInfo((KernelInfo*)DATA_PTR(self));
+    return Qnil;
 }
 
 /**
@@ -130,18 +134,18 @@ KernelInfo_show(VALUE self)
 VALUE
 KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 {
-  GeometryFlags geoflags;
+    GeometryFlags geoflags;
 
-  if (!FIXNUM_P(scale))
-    Check_Type(scale, T_FLOAT);
+    if (!FIXNUM_P(scale))
+        Check_Type(scale, T_FLOAT);
 
-  if (rb_obj_is_instance_of(flags, Class_GeometryFlags))
-    VALUE_TO_ENUM(flags, geoflags, GeometryFlags);
-  else
-    rb_raise(rb_eArgError, "expected Fixnum or Magick::GeometryFlags to specify flags");
+    if (rb_obj_is_instance_of(flags, Class_GeometryFlags))
+        VALUE_TO_ENUM(flags, geoflags, GeometryFlags);
+    else
+        rb_raise(rb_eArgError, "expected Integer or Magick::GeometryFlags to specify flags");
 
-  ScaleKernelInfo((KernelInfo*)DATA_PTR(self), NUM2DBL(scale), geoflags);
-  return Qnil;
+    ScaleKernelInfo((KernelInfo*)DATA_PTR(self), NUM2DBL(scale), geoflags);
+    return Qnil;
 }
 
 /**
@@ -157,9 +161,9 @@ KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 VALUE
 KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 {
-  Check_Type(geometry, T_STRING);
-  ScaleGeometryKernelInfo((KernelInfo*)DATA_PTR(self), StringValueCStr(geometry));
-  return Qnil;
+    Check_Type(geometry, T_STRING);
+    ScaleGeometryKernelInfo((KernelInfo*)DATA_PTR(self), StringValueCStr(geometry));
+    return Qnil;
 }
 
 /**
@@ -174,8 +178,8 @@ KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 VALUE
 KernelInfo_clone(VALUE self)
 {
-  KernelInfo *kernel = CloneKernelInfo((KernelInfo*)DATA_PTR(self));
-  return Data_Wrap_Struct(Class_KernelInfo, NULL, rm_kernel_info_destroy, kernel);
+    KernelInfo *kernel = CloneKernelInfo((KernelInfo*)DATA_PTR(self));
+    return Data_Wrap_Struct(Class_KernelInfo, NULL, rm_kernel_info_destroy, kernel);
 }
 
 /**
@@ -224,24 +228,25 @@ KernelInfo_clone(VALUE self)
  *                      Magick::OctagonalKernel
  *                      Magick::EuclideanKernel
  *                      Magick::UserDefinedKernel
+ *                      Magick::BinomialKernel
  * @param geometry geometry to pass to default kernel
  * @return KernelInfo instance
  */
 VALUE
 KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
 {
-  KernelInfo *kernel;
-  KernelInfoType kernel_type;
-  GeometryInfo info;
+    KernelInfo *kernel;
+    KernelInfoType kernel_type;
+    GeometryInfo info;
 
-  Check_Type(geometry, T_STRING);
-  VALUE_TO_ENUM(what, kernel_type, KernelInfoType);
-  ParseGeometry(StringValueCStr(geometry), &info);
+    Check_Type(geometry, T_STRING);
+    VALUE_TO_ENUM(what, kernel_type, KernelInfoType);
+    ParseGeometry(StringValueCStr(geometry), &info);
 
-  kernel = AcquireKernelBuiltIn(kernel_type, &info);
+    kernel = AcquireKernelBuiltIn(kernel_type, &info);
 
-  if (!kernel)
-    rb_raise(rb_eRuntimeError, "failed to acquire builtin kernel");
+    if (!kernel)
+        rb_raise(rb_eRuntimeError, "failed to acquire builtin kernel");
 
-  return Data_Wrap_Struct(self, NULL, rm_kernel_info_destroy, kernel);
+    return Data_Wrap_Struct(self, NULL, rm_kernel_info_destroy, kernel);
 }

data/ext/RMagick/rmmain.c

@@ -13,7 +13,6 @@
 
 #define MAIN                        // Define external variables
 #include "rmagick.h"
-#include "magick/version.h"
 
 /*----------------------------------------------------------------------------\
 | External declarations
@@ -25,13 +24,34 @@ static void version_constants(void);
 static void features_constant(void);
 
 
+/*
+ *  Enum constants - define a subclass of Enum for the specified enumeration.
+ *  Define an instance of the subclass for each member in the enumeration.
+ *  Initialize each instance with its name and value.
+ */
+//! define Ruby enum
+#define DEF_ENUM(tag) {\
+   VALUE _cls, _enum;\
+   _cls =  Class_##tag = rm_define_enum_type(#tag);
+
+//! define Ruby enumerator elements
+#define ENUMERATOR(val)\
+   _enum = rm_enum_new(_cls, ID2SYM(rb_intern(#val)), INT2NUM(val));\
+   rb_define_const(Module_Magick, #val, _enum);
 
+//! define Ruby enumerator elements when name is different from the value
+#define ENUMERATORV(name, val)\
+   _enum = rm_enum_new(_cls, ID2SYM(rb_intern(#name)), INT2NUM(val));\
+   rb_define_const(Module_Magick, #name, _enum);
+
+//! end of an enumerator
+#define END_ENUM }
 
 /*
  *  Handle transferring ImageMagick memory allocations/frees to Ruby.
  *  These functions have the same signature as the equivalent C functions.
  */
-#if defined(HAVE_SETMAGICKMEMORYMETHODS)
+
 /**
  * Allocate memory.
  *
@@ -118,7 +138,6 @@ static void set_managed_memory(void)
         rb_define_const(Module_Magick, "MANAGED_MEMORY", Qfalse);
     }
 }
-#endif
 
 
 
@@ -139,11 +158,7 @@ Init_RMagick2(void)
 
     Module_Magick = rb_define_module("Magick");
 
-#if defined(HAVE_SETMAGICKMEMORYMETHODS)
     set_managed_memory();
-#else
-    rb_define_const(Module_Magick, "MANAGED_MEMORY", Qfalse);
-#endif
 
     /*-----------------------------------------------------------------------*/
     /* Create IDs for frequently used methods, etc.                          */
@@ -379,6 +394,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "flop!", Image_flop_bang, 0);
     rb_define_method(Class_Image, "frame", Image_frame, -1);
     rb_define_method(Class_Image, "function_channel", Image_function_channel, -1);
+    rb_define_method(Class_Image, "fx", Image_fx, -1);
     rb_define_method(Class_Image, "gamma_channel", Image_gamma_channel, -1);
     rb_define_method(Class_Image, "gamma_correct", Image_gamma_correct, -1);
     rb_define_method(Class_Image, "gaussian_blur", Image_gaussian_blur, -1);
@@ -883,18 +899,17 @@ Init_RMagick2(void)
         ENUMERATOR(DeactivateAlphaChannel)
         ENUMERATOR(ResetAlphaChannel)  /* deprecated */
         ENUMERATOR(SetAlphaChannel)
-#if defined(HAVE_ENUM_REMOVEALPHACHANNEL)
         ENUMERATOR(RemoveAlphaChannel)
-#endif
-#if defined(HAVE_ENUM_COPYALPHACHANNEL)
         ENUMERATOR(CopyAlphaChannel)
         ENUMERATOR(ExtractAlphaChannel)
         ENUMERATOR(OpaqueAlphaChannel)
         ENUMERATOR(ShapeAlphaChannel)
         ENUMERATOR(TransparentAlphaChannel)
-#endif
-#if defined(HAVE_ENUM_BACKGROUNDALPHACHANNEL)
         ENUMERATOR(BackgroundAlphaChannel)
+        ENUMERATOR(FlattenAlphaChannel)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(AssociateAlphaChannel)
+        ENUMERATOR(DisassociateAlphaChannel)
 #endif
     END_ENUM
 
@@ -915,36 +930,16 @@ Init_RMagick2(void)
         ENUMERATOR(BlueChannel)
         ENUMERATOR(YellowChannel)
         ENUMERATOR(OpacityChannel)
-
-
         ENUMERATOR(BlackChannel)
         ENUMERATOR(MatteChannel)
         ENUMERATOR(IndexChannel)
         ENUMERATOR(GrayChannel)
         ENUMERATOR(AllChannels)
-
-        // Define alternate names for ChannelType enums for Image::Info#channel=
-        // AlphaChannel == OpacityChannel
-        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("AlphaChannel")), INT2FIX(OpacityChannel));
-        rb_define_const(Module_Magick, "AlphaChannel", _enum);
-
-        // DefaultChannels
-        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("DefaultChannels")), INT2FIX(0xff & ~OpacityChannel));
-        rb_define_const(Module_Magick, "DefaultChannels", _enum);
-
-        // HueChannel == RedChannel
-        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("HueChannel")), INT2FIX(RedChannel));
-        rb_define_const(Module_Magick, "HueChannel", _enum);
-
-        // LuminosityChannel = BlueChannel
-        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("LuminosityChannel")), INT2FIX(BlueChannel));
-        rb_define_const(Module_Magick, "LuminosityChannel", _enum);
-
-        // SaturationChannel = GreenChannel
-        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("SaturationChannel")), INT2FIX(GreenChannel));
-        rb_define_const(Module_Magick, "SaturationChannel", _enum);
-
-
+        ENUMERATORV(AlphaChannel, OpacityChannel)
+        ENUMERATORV(DefaultChannels, 0xff & ~OpacityChannel)
+        ENUMERATORV(HueChannel, RedChannel)
+        ENUMERATORV(LuminosityChannel, BlueChannel)
+        ENUMERATORV(SaturationChannel, GreenChannel)
     END_ENUM
 
     // ClassType constants
@@ -968,10 +963,7 @@ Init_RMagick2(void)
         ENUMERATOR(YPbPrColorspace)
         ENUMERATOR(YUVColorspace)
         ENUMERATOR(CMYKColorspace)
-        rb_define_const(Module_Magick, "SRGBColorspace"
-                      , rm_enum_new(Class_ColorspaceType
-                      , ID2SYM(rb_intern("SRGBColorspace"))
-                      , INT2FIX(sRGBColorspace)));
+        ENUMERATORV(SRGBColorspace, sRGBColorspace)
         ENUMERATOR(HSLColorspace)
         ENUMERATOR(HWBColorspace)
         ENUMERATOR(HSBColorspace)
@@ -982,18 +974,27 @@ Init_RMagick2(void)
         ENUMERATOR(Rec709YCbCrColorspace)
         ENUMERATOR(LogColorspace)
         ENUMERATOR(CMYColorspace)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(LuvColorspace)
+        ENUMERATOR(HCLColorspace)
+        ENUMERATOR(LCHColorspace)
+        ENUMERATOR(LMSColorspace)
+        ENUMERATOR(LCHabColorspace)
+        ENUMERATOR(LCHuvColorspace)
+        ENUMERATORV(ScRGBColorspace, scRGBColorspace)
+        ENUMERATOR(HSIColorspace)
+        ENUMERATOR(HSVColorspace)
+        ENUMERATOR(HCLpColorspace)
+        ENUMERATOR(YDbDrColorspace)
+        ENUMERATORV(XyYColorspace, xyYColorspace)
+#endif
     END_ENUM
 
     // ComplianceType constants are defined as enums but used as bit flags
     DEF_ENUM(ComplianceType)
         ENUMERATOR(UndefinedCompliance)
-
         // AllCompliance is 0xffff, not too useful for us!
-        rb_define_const(Module_Magick, "AllCompliance"
-                  , rm_enum_new(Class_ComplianceType
-                  , ID2SYM(rb_intern("AllCompliance"))
-                  , INT2FIX(SVGCompliance|X11Compliance|XPMCompliance)));
-
+        ENUMERATORV(AllCompliance, SVGCompliance|X11Compliance|XPMCompliance)
         ENUMERATOR(NoCompliance)
         ENUMERATOR(SVGCompliance)
         ENUMERATOR(X11Compliance)
@@ -1002,14 +1003,10 @@ Init_RMagick2(void)
 
     // CompositeOperator constants
     DEF_ENUM(CompositeOperator)
-        ENUMERATOR(UndefinedCompositeOp)
-        ENUMERATOR(NoCompositeOp)
         ENUMERATOR(AddCompositeOp)
         ENUMERATOR(AtopCompositeOp)
         ENUMERATOR(BlendCompositeOp)
-#if defined(HAVE_ENUM_BLURCOMPOSITEOP)
         ENUMERATOR(BlurCompositeOp)
-#endif
         ENUMERATOR(BumpmapCompositeOp)
         ENUMERATOR(ChangeMaskCompositeOp)
         ENUMERATOR(ClearCompositeOp)
@@ -1026,10 +1023,10 @@ Init_RMagick2(void)
         ENUMERATOR(CopyRedCompositeOp)
         ENUMERATOR(CopyYellowCompositeOp)
         ENUMERATOR(DarkenCompositeOp)
-#if defined(HAVE_ENUM_DISTORTCOMPOSITEOP)
+        ENUMERATOR(DarkenIntensityCompositeOp)
         ENUMERATOR(DistortCompositeOp)
-#endif
         ENUMERATOR(DivideCompositeOp)
+        ENUMERATOR(DivideSrcCompositeOp)
         ENUMERATOR(DstAtopCompositeOp)
         ENUMERATOR(DstCompositeOp)
         ENUMERATOR(DstInCompositeOp)
@@ -1040,29 +1037,28 @@ Init_RMagick2(void)
         ENUMERATOR(DissolveCompositeOp)
         ENUMERATOR(ExclusionCompositeOp)
         ENUMERATOR(HardLightCompositeOp)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(HardMixCompositeOp)
+#endif
         ENUMERATOR(HueCompositeOp)
         ENUMERATOR(InCompositeOp)
         ENUMERATOR(LightenCompositeOp)
-#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP)
+        ENUMERATOR(LightenIntensityCompositeOp)
         ENUMERATOR(LinearBurnCompositeOp)
-#endif
-#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP)
         ENUMERATOR(LinearDodgeCompositeOp)
-#endif
         ENUMERATOR(LinearLightCompositeOp)
         ENUMERATOR(LuminizeCompositeOp)
+        ENUMERATOR(MathematicsCompositeOp)
         ENUMERATOR(MinusCompositeOp)
+        ENUMERATOR(MinusSrcCompositeOp)
         ENUMERATOR(ModulateCompositeOp)
         ENUMERATOR(MultiplyCompositeOp)
+        ENUMERATOR(NoCompositeOp)
         ENUMERATOR(OutCompositeOp)
         ENUMERATOR(OverCompositeOp)
         ENUMERATOR(OverlayCompositeOp)
-#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP)
         ENUMERATOR(PegtopLightCompositeOp)
-#endif
-#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP)
         ENUMERATOR(PinLightCompositeOp)
-#endif
         ENUMERATOR(PlusCompositeOp)
         ENUMERATOR(ReplaceCompositeOp)    // synonym for CopyCompositeOp
         ENUMERATOR(SaturateCompositeOp)
@@ -1075,9 +1071,8 @@ Init_RMagick2(void)
         ENUMERATOR(SrcOverCompositeOp)
         ENUMERATOR(SubtractCompositeOp)
         ENUMERATOR(ThresholdCompositeOp)
-#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP)
+        ENUMERATOR(UndefinedCompositeOp)
         ENUMERATOR(VividLightCompositeOp)
-#endif
         ENUMERATOR(XorCompositeOp)
     END_ENUM
 
@@ -1085,39 +1080,26 @@ Init_RMagick2(void)
     DEF_ENUM(CompressionType)
         ENUMERATOR(UndefinedCompression)
         ENUMERATOR(NoCompression)
-#if defined(HAVE_ENUM_B44COMPRESSION)
         ENUMERATOR(B44Compression)
-#endif
-#if defined(HAVE_ENUM_B44ACOMPRESSION)
         ENUMERATOR(B44ACompression)
-#endif
         ENUMERATOR(BZipCompression)
-#if defined(HAVE_ENUM_DXT1COMPRESSION)
         ENUMERATOR(DXT1Compression)
-#endif
-#if defined(HAVE_ENUM_DXT3COMPRESSION)
         ENUMERATOR(DXT3Compression)
-#endif
-#if defined(HAVE_ENUM_DXT5COMPRESSION)
         ENUMERATOR(DXT5Compression)
-#endif
         ENUMERATOR(FaxCompression)
         ENUMERATOR(Group4Compression)
         ENUMERATOR(JPEGCompression)
         ENUMERATOR(JPEG2000Compression)
         ENUMERATOR(LosslessJPEGCompression)
         ENUMERATOR(LZWCompression)
-#if defined(HAVE_ENUM_PIZCOMPRESSION)
         ENUMERATOR(PizCompression)
-#endif
-#if defined(HAVE_ENUM_PXR24COMPRESSION)
         ENUMERATOR(Pxr24Compression)
-#endif
         ENUMERATOR(RLECompression)
         ENUMERATOR(ZipCompression)
-#if defined(HAVE_ENUM_ZIPSCOMPRESSION)
         ENUMERATOR(ZipSCompression)
-#endif
+        ENUMERATOR(LZMACompression)
+        ENUMERATOR(JBIG1Compression)
+        ENUMERATOR(JBIG2Compression)
     END_ENUM
 
     // DecorationType constants
@@ -1142,46 +1124,30 @@ Init_RMagick2(void)
         ENUMERATOR(AffineDistortion)
         ENUMERATOR(AffineProjectionDistortion)
         ENUMERATOR(ArcDistortion)
-#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)
-#if defined(HAVE_ENUM_BILINEARFORWARDDISTORTION)
         ENUMERATOR(BilinearForwardDistortion)
-#endif
-#if defined(HAVE_ENUM_BILINEARREVERSEDISTORTION)
         ENUMERATOR(BilinearReverseDistortion)
-#endif
         ENUMERATOR(PerspectiveDistortion)
         ENUMERATOR(PerspectiveProjectionDistortion)
-#if defined(HAVE_ENUM_POLYNOMIALDISTORTION)
         ENUMERATOR(PolynomialDistortion)
-#endif
         ENUMERATOR(ScaleRotateTranslateDistortion)
-#if defined(HAVE_ENUM_SHEPARDSDISTORTION)
         ENUMERATOR(ShepardsDistortion)
-#endif
-#if defined(HAVE_ENUM_BARRELINVERSEDISTORTION)
         ENUMERATOR(BarrelInverseDistortion)
-#endif
+        ENUMERATOR(Cylinder2PlaneDistortion)
+        ENUMERATOR(Plane2CylinderDistortion)
+        ENUMERATOR(ResizeDistortion)
+        ENUMERATOR(SentinelDistortion)
     END_ENUM
 
-#if defined(HAVE_TYPE_DITHERMETHOD)
     DEF_ENUM(DitherMethod)
         ENUMERATOR(UndefinedDitherMethod)
-#if defined(HAVE_ENUM_NODITHERMETHOD)
         ENUMERATOR(NoDitherMethod)
-#endif
         ENUMERATOR(RiemersmaDitherMethod)
         ENUMERATOR(FloydSteinbergDitherMethod)
     END_ENUM
-#endif
 
     DEF_ENUM(EndianType)
         ENUMERATOR(UndefinedEndian)
@@ -1207,23 +1173,23 @@ Init_RMagick2(void)
         ENUMERATOR(LanczosFilter)
         ENUMERATOR(BesselFilter)
         ENUMERATOR(SincFilter)
-#if defined(HAVE_ENUM_KAISERFILTER)
         ENUMERATOR(KaiserFilter)
-#endif
-#if defined(HAVE_ENUM_WELSHFILTER)
         ENUMERATOR(WelshFilter)
-#endif
-#if defined(HAVE_ENUM_PARZENFILTER)
         ENUMERATOR(ParzenFilter)
-#endif
-#if defined(HAVE_ENUM_LAGRANGEFILTER)
         ENUMERATOR(LagrangeFilter)
-#endif
-#if defined(HAVE_ENUM_BOHMANFILTER)
         ENUMERATOR(BohmanFilter)
-#endif
-#if defined(HAVE_ENUM_BARTLETTFILTER)
         ENUMERATOR(BartlettFilter)
+        ENUMERATOR(JincFilter)
+        ENUMERATOR(SincFastFilter)
+        ENUMERATOR(LanczosSharpFilter)
+        ENUMERATOR(Lanczos2Filter)
+        ENUMERATOR(Lanczos2SharpFilter)
+        ENUMERATOR(RobidouxFilter)
+        ENUMERATOR(RobidouxSharpFilter)
+        ENUMERATOR(CosineFilter)
+        ENUMERATOR(SplineFilter)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(LanczosRadiusFilter)
 #endif
     END_ENUM
 
@@ -1281,27 +1247,22 @@ Init_RMagick2(void)
         ENUMERATOR(MeshInterpolatePixel)
         ENUMERATOR(NearestNeighborInterpolatePixel)
         ENUMERATOR(SplineInterpolatePixel)
+        ENUMERATOR(Average9InterpolatePixel)
+        ENUMERATOR(Average16InterpolatePixel)
+        ENUMERATOR(BlendInterpolatePixel)
+        ENUMERATOR(BackgroundInterpolatePixel)
+        ENUMERATOR(CatromInterpolatePixel)
     END_ENUM
 
-#if defined(HAVE_TYPE_MAGICKFUNCTION)
     DEF_ENUM(MagickFunction)
         ENUMERATOR(UndefinedFunction)
         ENUMERATOR(PolynomialFunction)
         ENUMERATOR(SinusoidFunction)
-#if defined(HAVE_ENUM_ARCSINFUNCTION)
         ENUMERATOR(ArcsinFunction)
-#endif
-#if defined(HAVE_ENUM_ARCTANFUNCTION)
         ENUMERATOR(ArctanFunction)
-#endif
     END_ENUM
-#endif
 
-#if defined(HAVE_TYPE_IMAGELAYERMETHOD)
     DEF_ENUM(ImageLayerMethod)
-#else
-    DEF_ENUM(MagickLayerMethod)
-#endif
         ENUMERATOR(UndefinedLayer)
         ENUMERATOR(CompareAnyLayer)
         ENUMERATOR(CompareClearLayer)
@@ -1311,24 +1272,14 @@ Init_RMagick2(void)
         ENUMERATOR(CoalesceLayer)
         ENUMERATOR(DisposeLayer)
         ENUMERATOR(OptimizeTransLayer)
-#if defined(HAVE_ENUM_OPTIMIZEIMAGELAYER)
         ENUMERATOR(OptimizeImageLayer)
-#endif
         ENUMERATOR(RemoveDupsLayer)
         ENUMERATOR(RemoveZeroLayer)
         ENUMERATOR(CompositeLayer)
-#if defined(HAVE_ENUM_MERGELAYER)
         ENUMERATOR(MergeLayer)
-#endif
-#if defined(HAVE_ENUM_MOSAICLAYER)
         ENUMERATOR(MosaicLayer)
-#endif
-#if defined(HAVE_ENUM_FLATTENLAYER)
         ENUMERATOR(FlattenLayer)
-#endif
-#if defined(HAVE_ENUM_TRIMBOUNDSLAYER)
         ENUMERATOR(TrimBoundsLayer)
-#endif
     END_ENUM
 
     DEF_ENUM(MetricType)
@@ -1340,6 +1291,12 @@ Init_RMagick2(void)
         ENUMERATOR(PeakAbsoluteErrorMetric)
         ENUMERATOR(PeakSignalToNoiseRatioMetric)
         ENUMERATOR(RootMeanSquaredErrorMetric)
+        ENUMERATOR(NormalizedCrossCorrelationErrorMetric)
+        ENUMERATOR(FuzzErrorMetric)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(UndefinedErrorMetric)
+        ENUMERATOR(PerceptualHashErrorMetric)
+#endif
     END_ENUM
 
     // NoiseType constants
@@ -1422,47 +1379,27 @@ Init_RMagick2(void)
         ENUMERATOR(RShiftQuantumOperator)
         ENUMERATOR(SubtractQuantumOperator)
         ENUMERATOR(XorQuantumOperator)
-#if defined(HAVE_ENUM_POWEVALUATEOPERATOR)
         ENUMERATOR(PowQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_LOGEVALUATEOPERATOR)
         ENUMERATOR(LogQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_THRESHOLDEVALUATEOPERATOR)
         ENUMERATOR(ThresholdQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_THRESHOLDBLACKEVALUATEOPERATOR)
         ENUMERATOR(ThresholdBlackQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_THRESHOLDWHITEEVALUATEOPERATOR)
         ENUMERATOR(ThresholdWhiteQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_GAUSSIANNOISEEVALUATEOPERATOR)
         ENUMERATOR(GaussianNoiseQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_IMPULSENOISEEVALUATEOPERATOR)
         ENUMERATOR(ImpulseNoiseQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_LAPLACIANNOISEEVALUATEOPERATOR)
         ENUMERATOR(LaplacianNoiseQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_MULTIPLICATIVENOISEEVALUATEOPERATOR)
         ENUMERATOR(MultiplicativeNoiseQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_POISSONNOISEEVALUATEOPERATOR)
         ENUMERATOR(PoissonNoiseQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_UNIFORMNOISEEVALUATEOPERATOR)
         ENUMERATOR(UniformNoiseQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_COSINEEVALUATEOPERATOR)
         ENUMERATOR(CosineQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_SINEEVALUATEOPERATOR)
         ENUMERATOR(SineQuantumOperator)
-#endif
-#if defined(HAVE_ENUM_ADDMODULUSEVALUATEOPERATOR)
         ENUMERATOR(AddModulusQuantumOperator)
+        ENUMERATOR(MeanQuantumOperator)
+        ENUMERATOR(AbsQuantumOperator)
+        ENUMERATOR(ExponentialQuantumOperator)
+        ENUMERATOR(MedianQuantumOperator)
+        ENUMERATOR(SumQuantumOperator)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(RootMeanSquareQuantumOperator)
 #endif
     END_ENUM
 
@@ -1482,7 +1419,6 @@ Init_RMagick2(void)
         ENUMERATOR(PixelsPerCentimeterResolution)
     END_ENUM
 
-#if defined(HAVE_SPARSECOLORIMAGE)
     DEF_ENUM(SparseColorMethod)
         ENUMERATOR(UndefinedColorInterpolate)
         ENUMERATOR(BarycentricColorInterpolate)
@@ -1490,8 +1426,8 @@ Init_RMagick2(void)
         //ENUMERATOR(PolynomialColorInterpolate)
         ENUMERATOR(ShepardsColorInterpolate)
         ENUMERATOR(VoronoiColorInterpolate)
+        ENUMERATOR(InverseColorInterpolate)
     END_ENUM
-#endif
 
     // SpreadMethod
     DEF_ENUM(SpreadMethod)
@@ -1550,21 +1486,11 @@ Init_RMagick2(void)
         ENUMERATOR(BlackVirtualPixelMethod)
         ENUMERATOR(GrayVirtualPixelMethod)
         ENUMERATOR(WhiteVirtualPixelMethod)
-#if defined(HAVE_ENUM_HORIZONTALTILEVIRTUALPIXELMETHOD)
         ENUMERATOR(HorizontalTileVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_VERTICALTILEVIRTUALPIXELMETHOD)
         ENUMERATOR(VerticalTileVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_HORIZONTALTILEEDGEVIRTUALPIXELMETHOD)
         ENUMERATOR(HorizontalTileEdgeVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_VERTICALTILEEDGEVIRTUALPIXELMETHOD)
         ENUMERATOR(VerticalTileEdgeVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_CHECKERTILEVIRTUALPIXELMETHOD)
         ENUMERATOR(CheckerTileVirtualPixelMethod)
-#endif
     END_ENUM
     // WeightType constants
     DEF_ENUM(WeightType)
@@ -1577,9 +1503,34 @@ Init_RMagick2(void)
 
     // For KernelInfo scaling
     DEF_ENUM(GeometryFlags)
+        ENUMERATOR(NoValue)
+        ENUMERATOR(XValue)
+        ENUMERATOR(XiValue)
+        ENUMERATOR(YValue)
+        ENUMERATOR(PsiValue)
+        ENUMERATOR(WidthValue)
+        ENUMERATOR(RhoValue)
+        ENUMERATOR(HeightValue)
+        ENUMERATOR(SigmaValue)
+        ENUMERATOR(ChiValue)
+        ENUMERATOR(XiNegative)
+        ENUMERATOR(XNegative)
+        ENUMERATOR(PsiNegative)
+        ENUMERATOR(YNegative)
+        ENUMERATOR(ChiNegative)
+        ENUMERATOR(PercentValue)
+        ENUMERATOR(AspectValue)
         ENUMERATOR(NormalizeValue)
+        ENUMERATOR(LessValue)
+        ENUMERATOR(GreaterValue)
+        ENUMERATOR(MinimumValue)
         ENUMERATOR(CorrelateNormalizeValue)
-        ENUMERATOR(PercentValue)
+        ENUMERATOR(AreaValue)
+        ENUMERATOR(DecimalValue)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(SeparatorValue)
+#endif
+        ENUMERATOR(AllValues)
     END_ENUM
 
     // Morphology methods
@@ -1606,6 +1557,7 @@ Init_RMagick2(void)
       ENUMERATOR(ThinningMorphology)
       ENUMERATOR(ThickenMorphology)
       ENUMERATOR(VoronoiMorphology)
+      ENUMERATOR(IterativeDistanceMorphology)
     END_ENUM
 
     DEF_ENUM(KernelInfoType)
@@ -1646,6 +1598,9 @@ Init_RMagick2(void)
       ENUMERATOR(OctagonalKernel)
       ENUMERATOR(EuclideanKernel)
       ENUMERATOR(UserDefinedKernel)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+      ENUMERATOR(BinomialKernel)
+#endif
     END_ENUM
 
     /*-----------------------------------------------------------------------*/
@@ -1817,18 +1772,8 @@ features_constant(void)
 {
     VALUE features;
 
-#if defined(HAVE_GETMAGICKFEATURES)
     // 6.5.7 - latest (7.0.0)
     features = rb_str_new2(GetMagickFeatures());
-#elif defined(MagickFeatures)
-    // 6.5.7 - latest (7.0.0)
-    features = rb_str_new2(MagickFeatures);
-#elif defined(MagickSupport)
-    // 6.5.5 - 6.5.6
-    features = rb_str_new2(MagickSupport);
-#else
-    features = rb_str_new("unknown", 7);
-#endif
 
     rb_obj_freeze(features);
     rb_define_const(Module_Magick, "Magick_features", features);