rmagick 1.15.17 → 2.0.0

data/ext/RMagick/rmutil.c

@@ -1,6 +1,6 @@
-/* $Id: rmutil.c,v 1.90.2.3.2.7 2008/09/10 23:22:46 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.138 2007/12/26 21:43:52 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2008 by Timothy P. Hunter
+|                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rmutil.c
 | Author:   Tim Hunter
 | Purpose:  Utility functions for RMagick
@@ -16,58 +16,46 @@ static void Color_Name_to_PixelPacket(PixelPacket *, VALUE);
 static VALUE Enum_type_values(VALUE);
 static VALUE Enum_type_inspect(VALUE);
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
-#if defined(HAVE_NEW_COLORINFO)
 static VALUE Pixel_from_MagickPixelPacket(MagickPixelPacket *);
-#endif
 
-#if !defined(HAVE_ACQUIREMAGICKMEMORY)
+
 /*
-    Dummy versions of ImageMagick memory routines for use with GraphicsMagick.
+    Extern:     magick_safe_malloc, magick_malloc, magick_free, magick_realloc
+    Purpose:    ImageMagick versions of standard memory routines.
+    Notes:      use when managing memory that ImageMagick may have
+                allocated or may free.
+
+                If malloc fails, it raises an exception.
+
+                magick_safe_malloc and magick_safe_realloc prevent exceptions
+                caused by integer overflow. Added in 6.3.5-9 but backwards
+                compatible with prior releases.
 */
-static void *AcquireMagickMemory(const size_t size)
+void *magick_safe_malloc(const size_t count, const size_t quantum)
 {
-    assert(size > 0);
-    return malloc(size);
-}
+#if defined(HAVE_ACQUIREQUANTUMMEMORY)
+    void *ptr;
 
-static void *RelinquishMagickMemory(void *memory)
-{
-    if (memory)
+    ptr = AcquireQuantumMemory(count, quantum);
+    if (!ptr)
     {
-        free(memory);
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
-    return NULL;
-}
+    return ptr;
+#else
 
-static void *ResizeMagickMemory(void *memory, const size_t size)
-{
-    void *new;
+    // Provide an implementation of AcquireQuantumMemory in releases prior to 6.3.5-9.
+    size_t size = count * quantum;
 
-    if (!memory)
-    {
-        return malloc(size);
-    }
-    if (size == 0)
-    {
-        free(memory);
-        return NULL;
-    }
-    new = realloc(memory, size);
-    if (!new)
+    if (count == 0 || quantum != (size/count))
     {
-        free(memory);
+        rb_raise(rb_eRuntimeError, "integer overflow detected in memory size computation. "
+               "Probable image corruption.");
     }
-    return new;
-}
+    return magick_malloc(size);
 #endif
+}
 
-/*
-    Extern:     magick_malloc, magick_free, magick_realloc
-    Purpose:    ****Magick versions of standard memory routines.
-    Notes:      use when managing memory that ****Magick may have
-                allocated or may free.
-                If malloc fails, it raises an exception
-*/
 void *magick_malloc(const size_t size)
 {
     void *ptr;
@@ -85,6 +73,28 @@ void magick_free(void *ptr)
     (void) RelinquishMagickMemory(ptr);
 }
 
+void *magick_safe_realloc(void *memory, const size_t count, const size_t quantum)
+{
+#if defined(HAVE_RESIZEQUANTUMMEMORY)
+    void *v;
+    v = ResizeQuantumMemory(memory, count, quantum);
+    if (!v)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
+    return v;
+#else
+    // Provide an implementation of ResizeQuantumMemory in releases prior to 6.3.5-9.
+    size_t size = count * quantum;
+    if (count == 0 || quantum != (size/count))
+    {
+        rb_raise(rb_eRuntimeError, "integer overflow detected in memory size computation. "
+               "Probable image corruption.");
+    }
+    return magick_realloc(memory, size);
+#endif
+}
+
 void *magick_realloc(void *ptr, const size_t size)
 {
     void *v;
@@ -110,57 +120,6 @@ void magick_clone_string(char **new_str, const char *str)
 }
 
 
-
-/*
-    Extern:     rm_string_value_ptr(VALUE*)
-    Purpose:    emulate Ruby 1.8's rb_string_value_ptr
-    Notes:      This is essentially 1.8's rb_string_value_ptr
-                with a few minor changes to make it work in 1.6.
-                Always called via STRING_PTR
-*/
-#if !defined StringValuePtr
-char *
-rm_string_value_ptr(volatile VALUE *ptr)
-{
-    volatile VALUE s = *ptr;
-
-    // If VALUE is not a string, call to_str on it
-    if (TYPE(s) != T_STRING)
-    {
-       s = rb_str_to_str(s);
-       *ptr = s;
-    }
-    // If ptr == NULL, allocate a 1 char array
-    if (!RSTRING(s)->ptr)
-    {
-        RSTRING(s)->ptr = ALLOC_N(char, 1);
-        (RSTRING(s)->ptr)[0] = 0;
-        RSTRING(s)->orig = 0;
-    }
-    return RSTRING(s)->ptr;
-}
-#endif
-
-/*
-    Extern:     rm_string_value_ptr_len
-    Purpose:    safe replacement for rb_str2cstr
-    Returns:    stores string length in 2nd arg, returns ptr to C string
-    Notes:      Uses rb/rm_string_value_ptr to ensure correct String
-                argument.
-                Always called via STRING_PTR_LEN
-*/
-char *rm_string_value_ptr_len(volatile VALUE *ptr, long *len)
-{
-    volatile VALUE v = *ptr;
-    char *str;
-
-    str = STRING_PTR(v);
-    *ptr = v;
-    *len = RSTRING(v)->len;
-    return str;
-}
-
-
 /*
  *  Extern:     rm_strcasecmp(s1, s2)
  *  Purpose:    compare s1 and s2 ignoring case
@@ -182,6 +141,8 @@ rm_strcasecmp(const char *s1, const char *s2)
 }
 
 
+
+
 /*
  *  Extern:     rm_strncasecmp(s1, s2, n)
  *  Purpose:    compare s1 and s2 ignoring case
@@ -208,8 +169,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
@@ -220,21 +179,40 @@ rm_check_ary_len(VALUE ary, long len)
     if (RARRAY(ary)->len < len)
     {
         rb_raise(rb_eIndexError, "not enough elements in array - expecting %ld, got %ld",
-                        len, RARRAY(ary)->len);
+                        len, (long)RARRAY(ary)->len);
     }
 }
 
+
 /*
-    Extern:     rm_check_frozen
-    Purpose:    backport rb_check_frozen for 1.6.x releases
+    Extern:     rm_check_destroyed
+    Purpose:    raise an error if the image has been destroyed
 */
-void
-rm_check_frozen(VALUE obj)
+Image *
+rm_check_destroyed(VALUE obj)
 {
-    if (OBJ_FROZEN(obj))
+    Image *image;
+
+    Data_Get_Struct(obj, Image, image);
+    if (!image)
     {
-        rb_error_frozen(rb_class2name(CLASS_OF(obj)));
+        rb_raise(Class_DestroyedImageError, "destroyed image");
     }
+
+    return image;
+}
+
+
+/*
+    Extern:     rm_check_frozen_image
+    Purpose:    raise an error if the image has been destroyed or is frozen
+*/
+Image *
+rm_check_frozen_image(VALUE obj)
+{
+    Image *image = rm_check_destroyed(obj);
+    rb_check_frozen(obj);
+    return image;
 }
 
 
@@ -296,7 +274,7 @@ rm_percentage(VALUE arg)
     if (not_num)
     {
         arg = rb_rescue(rb_str_to_str, arg, rescue_not_str, arg);
-        pct_str = STRING_PTR(arg);
+        pct_str = StringValuePtr(arg);
         errno = 0;
         pct_long = strtol(pct_str, &end, 10);
         if (errno == ERANGE)
@@ -353,7 +331,7 @@ check_num2dbl(VALUE obj)
 static VALUE
 rescue_not_dbl(VALUE ignored)
 {
-    ignored = ignored; // defeat gcc message
+    ignored = ignored;      // defeat gcc message
     return INT2FIX(0);
 }
 
@@ -379,7 +357,7 @@ double rm_str_to_pct(VALUE str)
     char *pct_str, *end;
 
     str = rb_rescue(rb_str_to_str, str, rescue_not_str, str);
-    pct_str = STRING_PTR(str);
+    pct_str = StringValuePtr(str);
     errno = 0;
     pct = strtol(pct_str, &end, 10);
 
@@ -404,7 +382,7 @@ double rm_str_to_pct(VALUE str)
  *  Extern:     rm_fuzz_to_dbl(obj)
  *  Purpose:    If the argument is a number, convert it to a double.
  *              Otherwise it's supposed to be a string in the form 'NN%'.
- *              Return a percentage of MaxRGB.
+ *              Return a percentage of QuantumRange.
  *  Notes:      Called from Image#fuzz= and Info#fuzz=
 */
 double
@@ -421,7 +399,7 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
     {
         // Convert to string, issue error message if failure.
         fuzz_arg = rb_rescue(rb_str_to_str, fuzz_arg, rescue_not_str, fuzz_arg);
-        fuzz_str = STRING_PTR(fuzz_arg);
+        fuzz_str = StringValuePtr(fuzz_arg);
         errno = 0;
         fuzz = strtod(fuzz_str, &end);
         if (errno == ERANGE)
@@ -434,7 +412,7 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
             {
                 rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", fuzz_str);
             }
-            fuzz = (fuzz * MaxRGB) / 100.0;
+            fuzz = (fuzz * QuantumRange) / 100.0;
         }
         else if(*end != '\0')
         {
@@ -454,6 +432,29 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
 }
 
 
+/*
+    Extern:     rm_app2quantum
+    Purpose:    Convert a application-supplied number to a Quantum. If the object
+                is a Float, truncate it before converting.
+    Notes:      Ruby says that 2147483647.5 doesn't fit into an unsigned long.
+                If you truncate it, it works.
+                Should use this only when the input value is possibly subject
+                to this problem.
+*/
+Quantum
+rm_app2quantum(VALUE obj)
+{
+    volatile VALUE v = obj;
+
+    if (TYPE(obj) == T_FLOAT)
+    {
+        v = rb_funcall(obj, rm_ID_to_i, 0);
+    }
+
+    return NUM2QUANTUM(v);
+}
+
+
 /*
     Extern:     ImageList_cur_image
     Purpose:    Sends the "cur_image" method to the object. If 'img'
@@ -516,8 +517,8 @@ Pixel_to_s(VALUE self)
     char buff[100];
 
     Data_Get_Struct(self, Pixel, pixel);
-    sprintf(buff, "red=%d, green=%d, blue=%d, opacity=%d"
-          , (int)pixel->red, (int)pixel->green, (int)pixel->blue, (int)pixel->opacity);
+    sprintf(buff, "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", opacity=" QuantumFormat
+          , pixel->red, pixel->green, pixel->blue, pixel->opacity);
     return rb_str_new2(buff);
 }
 
@@ -540,13 +541,13 @@ Pixel_from_color(VALUE class, VALUE name)
     class = class;      // defeat "never referenced" message from icc
 
     GetExceptionInfo(&exception);
-    okay = QueryColorDatabase(STRING_PTR(name), &pp, &exception);
+    okay = QueryColorDatabase(StringValuePtr(name), &pp, &exception);
     CHECK_EXCEPTION()
     (void) DestroyExceptionInfo(&exception);
 
     if (!okay)
     {
-        rb_raise(rb_eArgError, "invalid color name: %s", STRING_PTR(name));
+        rb_raise(rb_eArgError, "invalid color name: %s", StringValuePtr(name));
     }
 
     return Pixel_from_PixelPacket(&pp);
@@ -632,7 +633,6 @@ Pixel_to_HSL(VALUE self)
     volatile VALUE hsl;
 
     Data_Get_Struct(self, Pixel, pixel);
-
 #if defined(HAVE_CONVERTRGBTOHSL)
     ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &saturation, &luminosity);
 #else
@@ -653,10 +653,11 @@ Pixel_to_HSL(VALUE self)
 VALUE
 Pixel_from_HSL(VALUE class, VALUE hsl)
 {
-    PixelPacket rgb = {0};
+    PixelPacket rgb;
     double hue, saturation, luminosity;
 
     class = class;      // defeat "never referenced" message from icc
+    memset(&rgb, 0, sizeof(rgb));
 
     hsl = rb_Array(hsl);    // Ensure array
     if (RARRAY(hsl)->len < 3)
@@ -675,7 +676,6 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
     HSLTransform(hue, saturation, luminosity,
                  &rgb.red, &rgb.green, &rgb.blue);
 #endif
-
     return Pixel_from_PixelPacket(&rgb);
 }
 
@@ -696,10 +696,8 @@ Pixel_eql_q(VALUE self, VALUE other)
 VALUE
 Pixel_fcmp(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_FUZZYCOLORCOMPARE)
     Image *image;
     Info *info;
-#endif
 
     Pixel *this, *that;
     ColorspaceType colorspace = RGBColorspace;
@@ -723,8 +721,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(self, Pixel, this);
     Data_Get_Struct(argv[0], Pixel, that);
 
-#if defined(HAVE_FUZZYCOLORCOMPARE) || defined(HAVE_ISCOLORSIMILAR)
-    // The FuzzyColorCompare function expects to get the
+    // The IsColorSimilar function expects to get the
     // colorspace and fuzz parameters from an Image structure.
 
     info = CloneImageInfo(NULL);
@@ -734,26 +731,21 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     }
 
     image = AllocateImage(info);
+
+    // Delete Info now in case we have to raise an exception
+    (void) DestroyImageInfo(info);
+
     if (!image)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
-    (void) DestroyImageInfo(info);
 
     image->colorspace = colorspace;
     image->fuzz = fuzz;
 
-#if defined(HAVE_ISCOLORSIMILAR)
     equal = IsColorSimilar(image, this, that);
-#else
-    equal = FuzzyColorCompare(image, this, that);
-#endif
     (void) DestroyImage(image);
 
-#else
-    equal = FuzzyColorMatch(this, that, fuzz);
-#endif
-
     return equal ? Qtrue : Qfalse;
 }
 
@@ -797,7 +789,7 @@ Pixel_intensity(VALUE self)
                                 + (0.587*pixel->green)
                                 + (0.114*pixel->blue));
 
-    return ULONG2NUM((unsigned long) intensity);
+    return QUANTUM2NUM((unsigned long) intensity);
 }
 
 
@@ -879,7 +871,6 @@ destroy_Pixel(Pixel *pixel)
 }
 
 
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 /*
     Extern:     Pixel_alloc
     Purpose:    Allocate a Pixel object
@@ -894,27 +885,6 @@ Pixel_alloc(VALUE class)
     return Data_Wrap_Struct(class, NULL, destroy_Pixel, pixel);
 }
 
-#else
-
-/*
-    Method:     Pixel.new
-    Purpose:    Construct a new Pixel object
-*/
-VALUE
-Pixel_new(int argc, VALUE *argv, VALUE class)
-{
-    Pixel *pixel;
-    volatile VALUE pixel_obj;
-
-    pixel = ALLOC(Pixel);
-    memset(pixel, '\0', sizeof(Pixel));
-    pixel_obj = Data_Wrap_Struct(class, NULL, destroy_Pixel, pixel);
-
-    rb_obj_call_init(pixel_obj, argc, argv);
-    return pixel_obj;
-}
-#endif
-
 
 /*
     Method:     Pixel#initialize(red=0,green=0,blue=0,opacity=0)
@@ -932,22 +902,22 @@ Pixel_initialize(int argc, VALUE *argv, VALUE self)
         case 4:
             if (argv[3] != Qnil)
             {
-                pixel->opacity = (Quantum) NUM2UINT(argv[3]);
+                pixel->opacity = APP2QUANTUM(argv[3]);
             }
         case 3:
             if (argv[2] != Qnil)
             {
-                pixel->blue = (Quantum) NUM2UINT(argv[2]);
+                pixel->blue = APP2QUANTUM(argv[2]);
             }
         case 2:
             if (argv[1] != Qnil)
             {
-                pixel->green = (Quantum) NUM2UINT(argv[1]);
+                pixel->green = APP2QUANTUM(argv[1]);
             }
         case 1:
             if (argv[0] != Qnil)
             {
-                pixel->red = (Quantum) NUM2UINT(argv[0]);
+                pixel->red = APP2QUANTUM(argv[0]);
             }
         case 0:
             break;
@@ -1011,7 +981,7 @@ Pixel_clone(VALUE self)
     clone = Pixel_dup(self);
     if (OBJ_FROZEN(self))
     {
-        (void) rb_obj_freeze(clone);
+        OBJ_FREEZE(clone);
     }
 
     return clone;
@@ -1136,7 +1106,7 @@ Color_Name_to_PixelPacket(PixelPacket *color, VALUE name_arg)
     ExceptionInfo exception;
 
     GetExceptionInfo(&exception);
-    name = STRING_PTR(name_arg);
+    name = StringValuePtr(name_arg);
     okay = QueryColorDatabase(name, color, &exception);
     (void) DestroyExceptionInfo(&exception);
     if (!okay)
@@ -1213,19 +1183,6 @@ ColorspaceType_new(ColorspaceType cs)
 {
     const char *name;
 
-#if defined(HAVE_REC601YCBCRCOLORSPACE)
-    // GM 1.2  defines this symbol to be equal to YCbCrColorspace,  so we
-    // can't use it as a case label.  GM wants the string version of this
-    // enumerator to be Rec601YCbCrColorspace (see ColorspaceTypeToString
-    // in colorspace.c) so that's what we return for both versions of the
-    // enumerator.
-    if (cs == Rec601YCbCrColorspace)
-    {
-        return rm_enum_new(Class_ColorspaceType
-            , ID2SYM(rb_intern("Rec601YCbCrColorspace")), INT2FIX(cs));
-    }
-#endif
-
     switch(cs)
     {
         default:
@@ -1274,41 +1231,27 @@ ColorspaceType_new(ColorspaceType cs)
         case HWBColorspace:
             name = "HWBColorspace";
             break;
-#if defined(HAVE_HSBCOLORSPACE)
         case HSBColorspace:
             name = "HSBColorspace";
             break;
-#endif
-#if defined(HAVE_LABCOLORSPACE)
         case LABColorspace:
             name = "LABColorspace";
             break;
-#endif
-#if defined(HAVE_CINEONLOGRGBCOLORSPACE)
-        case CineonLogRGBColorspace:
-            name = "CineonLogRGBColorspace";
+        case Rec601YCbCrColorspace:
+            name = "Rec601YCbCrColorspace";
             break;
-#endif
-#if defined(HAVE_REC601LUMACOLORSPACE)
         case Rec601LumaColorspace:
             name = "Rec601LumaColorspace";
             break;
-#endif
-#if defined(HAVE_REC709LUMACOLORSPACE)
         case Rec709LumaColorspace:
             name = "Rec709LumaColorspace";
             break;
-#endif
-#if defined(HAVE_REC709YCBCRCOLORSPACE)
         case Rec709YCbCrColorspace:
             name = "Rec709YCbCrColorspace";
             break;
-#endif
-#if defined(HAVE_LOGCOLORSPACE)
         case LogColorspace:
             name = "LogColorspace";
             break;
-#endif
     }
 
     return rm_enum_new(Class_ColorspaceType, ID2SYM(rb_intern(name)), INT2FIX(cs));
@@ -1340,21 +1283,21 @@ CompositeOperator_name(CompositeOperator op)
 {
     switch (op)
     {
-        default:
         ENUM_TO_NAME(UndefinedCompositeOp)
         ENUM_TO_NAME(NoCompositeOp)
         ENUM_TO_NAME(AddCompositeOp)
         ENUM_TO_NAME(AtopCompositeOp)
         ENUM_TO_NAME(BumpmapCompositeOp)
+#if defined(HAVE_ENUM_CHANGEMASKCOMPOSITEOP)
+        ENUM_TO_NAME(ChangeMaskCompositeOp)
+#endif
         ENUM_TO_NAME(ClearCompositeOp)
-#if defined(HAVE_COLORDODGECOMPOSITEOP)
         ENUM_TO_NAME(ColorBurnCompositeOp)
         ENUM_TO_NAME(BlendCompositeOp)
         ENUM_TO_NAME(ColorDodgeCompositeOp)
         ENUM_TO_NAME(ExclusionCompositeOp)
         ENUM_TO_NAME(HardLightCompositeOp)
         ENUM_TO_NAME(SoftLightCompositeOp)
-#endif
         ENUM_TO_NAME(ColorizeCompositeOp)
         ENUM_TO_NAME(CopyBlueCompositeOp)
         ENUM_TO_NAME(CopyCompositeOp)
@@ -1366,19 +1309,23 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(CopyOpacityCompositeOp)
         ENUM_TO_NAME(CopyRedCompositeOp)
         ENUM_TO_NAME(DarkenCompositeOp)
-#if defined(HAVE_DSTCOMPOSITEOP)
+#if defined(HAVE_ENUM_DIVIDECOMPOSITEOP)
+        ENUM_TO_NAME(DivideCompositeOp)
+#endif
         ENUM_TO_NAME(DstAtopCompositeOp)
         ENUM_TO_NAME(DstCompositeOp)
         ENUM_TO_NAME(DstInCompositeOp)
         ENUM_TO_NAME(DstOutCompositeOp)
         ENUM_TO_NAME(DstOverCompositeOp)
-#endif
         ENUM_TO_NAME(DifferenceCompositeOp)
         ENUM_TO_NAME(DisplaceCompositeOp)
         ENUM_TO_NAME(DissolveCompositeOp)
         ENUM_TO_NAME(HueCompositeOp)
         ENUM_TO_NAME(InCompositeOp)
         ENUM_TO_NAME(LightenCompositeOp)
+#if defined(HAVE_ENUM_LINEARLIGHTCOMPOSITEOP)
+        ENUM_TO_NAME(LinearLightCompositeOp)
+#endif
         ENUM_TO_NAME(LuminizeCompositeOp)
         ENUM_TO_NAME(MinusCompositeOp)
         ENUM_TO_NAME(ModulateCompositeOp)
@@ -1387,22 +1334,20 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(OverCompositeOp)
         ENUM_TO_NAME(OverlayCompositeOp)
         ENUM_TO_NAME(PlusCompositeOp)
-#if defined(HAVE_REPLACECOMPOSITEOP)    // Added 5.5.8
         ENUM_TO_NAME(ReplaceCompositeOp)
-#endif
         ENUM_TO_NAME(SaturateCompositeOp)
         ENUM_TO_NAME(ScreenCompositeOp)
-#if defined(HAVE_DSTCOMPOSITEOP)
         ENUM_TO_NAME(SrcAtopCompositeOp)
         ENUM_TO_NAME(SrcCompositeOp)
         ENUM_TO_NAME(SrcInCompositeOp)
         ENUM_TO_NAME(SrcOutCompositeOp)
         ENUM_TO_NAME(SrcOverCompositeOp)
-#endif
         ENUM_TO_NAME(SubtractCompositeOp)
         ENUM_TO_NAME(ThresholdCompositeOp)
         ENUM_TO_NAME(XorCompositeOp)
     }
+
+    return "UndefinedCompositeOp";
 }
 
 /*
@@ -1412,9 +1357,7 @@ CompositeOperator_name(CompositeOperator op)
 VALUE
 CompositeOperator_new(CompositeOperator op)
 {
-    const char *name;
-
-    name = CompositeOperator_name(op);
+    const char *name = CompositeOperator_name(op);
     return rm_enum_new(Class_CompositeOperator, ID2SYM(rb_intern(name)), INT2FIX(op));
 }
 
@@ -1428,18 +1371,20 @@ CompressionType_name(CompressionType ct)
 {
     switch (ct)
     {
-        default:
         ENUM_TO_NAME(UndefinedCompression)
         ENUM_TO_NAME(NoCompression)
         ENUM_TO_NAME(BZipCompression)
         ENUM_TO_NAME(FaxCompression)
         ENUM_TO_NAME(Group4Compression)
         ENUM_TO_NAME(JPEGCompression)
+        ENUM_TO_NAME(JPEG2000Compression)
         ENUM_TO_NAME(LosslessJPEGCompression)
         ENUM_TO_NAME(LZWCompression)
         ENUM_TO_NAME(RLECompression)
         ENUM_TO_NAME(ZipCompression)
     }
+
+    return "UndefinedCompression";
 }
 
 
@@ -1450,9 +1395,7 @@ CompressionType_name(CompressionType ct)
 VALUE
 CompressionType_new(CompressionType ct)
 {
-    const char *name;
-
-    name = CompressionType_name(ct);
+    const char *name = CompressionType_name(ct);
     return rm_enum_new(Class_CompressionType, ID2SYM(rb_intern(name)), INT2FIX(ct));
 }
 
@@ -1466,12 +1409,13 @@ DisposeType_name(DisposeType type)
 {
     switch(type)
     {
-        default:
         ENUM_TO_NAME(UndefinedDispose)
         ENUM_TO_NAME(BackgroundDispose)
         ENUM_TO_NAME(NoneDispose)
         ENUM_TO_NAME(PreviousDispose)
     }
+
+    return "UndefinedDispose";
 }
 
 
@@ -1482,9 +1426,7 @@ DisposeType_name(DisposeType type)
 VALUE
 DisposeType_new(DisposeType type)
 {
-    const char *name;
-
-    name = DisposeType_name(type);
+    const char *name = DisposeType_name(type);
     return rm_enum_new(Class_DisposeType, ID2SYM(rb_intern(name)), INT2FIX(type));
 }
 
@@ -1498,7 +1440,6 @@ FilterTypes_name(FilterTypes type)
 {
     switch(type)
     {
-        default:
         ENUM_TO_NAME(UndefinedFilter)
         ENUM_TO_NAME(PointFilter)
         ENUM_TO_NAME(BoxFilter)
@@ -1515,7 +1456,30 @@ 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)
+#endif
+#if defined(HAVE_ENUM_SENTINELFILTER)
+        ENUM_TO_NAME(SentinelFilter)
+#endif
     }
+
+    return "UndefinedFilter";
 }
 
 
@@ -1526,9 +1490,7 @@ FilterTypes_name(FilterTypes type)
 VALUE
 FilterTypes_new(FilterTypes type)
 {
-    const char *name;
-
-    name = FilterTypes_name(type);
+    const char *name = FilterTypes_name(type);
     return rm_enum_new(Class_FilterTypes, ID2SYM(rb_intern(name)), INT2FIX(type));
 }
 
@@ -1543,11 +1505,11 @@ EndianType_name(EndianType type)
 {
     switch(type)
     {
-        default:
         ENUM_TO_NAME(UndefinedEndian)
         ENUM_TO_NAME(LSBEndian)
         ENUM_TO_NAME(MSBEndian)
     }
+    return "UndefinedEndian";
 }
 
 /*
@@ -1557,13 +1519,50 @@ EndianType_name(EndianType type)
 VALUE
 EndianType_new(EndianType type)
 {
-    const char *name;
-
-    name = EndianType_name(type);
+    const char *name = EndianType_name(type);
     return rm_enum_new(Class_EndianType, ID2SYM(rb_intern(name)), INT2FIX(type));
 }
 
 
+/*
+    Static:     GravityType_name
+    Purpose:    Return the name of a GravityType enum as a string
+*/
+static const char *
+GravityType_name(GravityType type)
+{
+    switch(type)
+    {
+        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)
+    }
+
+    // Defeat "duplicate case value" error.
+    return "UndefinedGravity";
+}
+
+
+/*
+    External:  GravityType.new
+    Purpose: Construct an GravityType enum object for the specified value
+*/
+VALUE
+GravityType_new(GravityType type)
+{
+    const char *name = GravityType_name(type);
+    return rm_enum_new(Class_GravityType, ID2SYM(rb_intern(name)), INT2FIX(type));
+}
+
+
 
 /*
     Static:     ImageType_name
@@ -1571,9 +1570,9 @@ EndianType_new(EndianType type)
 */
 static char *
 ImageType_name(ImageType type)
-{    switch(type)
+{
+    switch(type)
     {
-        default:
         ENUM_TO_NAME(UndefinedType)
         ENUM_TO_NAME(BilevelType)
         ENUM_TO_NAME(GrayscaleType)
@@ -1585,11 +1584,10 @@ ImageType_name(ImageType type)
         ENUM_TO_NAME(ColorSeparationType)
         ENUM_TO_NAME(ColorSeparationMatteType)
         ENUM_TO_NAME(OptimizeType)
-#if defined(HAVE_PALETTEBILEVELMATTETYPE)
         ENUM_TO_NAME(PaletteBilevelMatteType)
-#endif
     }
 
+    return "UndefinedType";
 }
 
 
@@ -1600,9 +1598,7 @@ ImageType_name(ImageType type)
 VALUE
 ImageType_new(ImageType type)
 {
-    const char *name;
-
-    name = ImageType_name(type);
+    const char *name = ImageType_name(type);
     return rm_enum_new(Class_ImageType, ID2SYM(rb_intern(name)), INT2FIX(type));
 }
 
@@ -1616,13 +1612,23 @@ InterlaceType_name(InterlaceType interlace)
 {
     switch(interlace)
     {
-        default:
         ENUM_TO_NAME(UndefinedInterlace)
+#if defined(HAVE_ENUM_GIFINTERLACE)
+        ENUM_TO_NAME(GIFInterlace)
+#endif
+#if defined(HAVE_ENUM_JPEGINTERLACE)
+        ENUM_TO_NAME(JPEGInterlace)
+#endif
+#if defined(HAVE_ENUM_PNGINTERLACE)
+        ENUM_TO_NAME(PNGInterlace)
+#endif
         ENUM_TO_NAME(NoInterlace)
         ENUM_TO_NAME(LineInterlace)
         ENUM_TO_NAME(PlaneInterlace)
         ENUM_TO_NAME(PartitionInterlace)
     }
+
+    return "UndefinedInterlace";
 }
 
 
@@ -1633,9 +1639,7 @@ InterlaceType_name(InterlaceType interlace)
 VALUE
 InterlaceType_new(InterlaceType interlace)
 {
-    const char *name;
-
-    name = InterlaceType_name(interlace);
+    const char *name = InterlaceType_name(interlace);
     return rm_enum_new(Class_InterlaceType, ID2SYM(rb_intern(name)), INT2FIX(interlace));
 }
 
@@ -1644,13 +1648,11 @@ InterlaceType_new(InterlaceType interlace)
     Static:     InterpolatePixelMethod_name
     Purpose:    Return the name of a InterpolatePixelMethod enum as a string
 */
-#if defined(HAVE_INTERPOLATEPIXELCOLOR)
 static const char *
 InterpolatePixelMethod_name(InterpolatePixelMethod interpolate)
 {
     switch(interpolate)
     {
-        default:
         ENUM_TO_NAME(UndefinedInterpolatePixel)
         ENUM_TO_NAME(AverageInterpolatePixel)
         ENUM_TO_NAME(BicubicInterpolatePixel)
@@ -1659,7 +1661,12 @@ InterpolatePixelMethod_name(InterpolatePixelMethod interpolate)
         ENUM_TO_NAME(IntegerInterpolatePixel)
         ENUM_TO_NAME(MeshInterpolatePixel)
         ENUM_TO_NAME(NearestNeighborInterpolatePixel)
+#if defined(HAVE_ENUM_SPLINEINTERPOLATEPIXEL)
+        ENUM_TO_NAME(SplineInterpolatePixel)
+#endif
     }
+
+    return "UndefinedInterpolatePixel";
 }
 
 
@@ -1670,47 +1677,64 @@ InterpolatePixelMethod_name(InterpolatePixelMethod interpolate)
 VALUE
 InterpolatePixelMethod_new(InterpolatePixelMethod interpolate)
 {
-    const char *name;
-
-    name = InterpolatePixelMethod_name(interpolate);
+    const char *name = InterpolatePixelMethod_name(interpolate);
     return rm_enum_new(Class_InterpolatePixelMethod, ID2SYM(rb_intern(name)), INT2FIX(interpolate));
 }
-#endif
 
 
 /*
     External:   MagickLayerMethod_new
     Purpose:    Construct an MagickLayerMethod enum object for the specified value.
 */
-#if defined(HAVE_COMPAREIMAGELAYERS)
 static const char *
-MagickLayerMethod_name(MagickLayerMethod method)
+LAYERMETHODTYPE_NAME(LAYERMETHODTYPE method)
 {
     switch(method)
     {
-        default:
         ENUM_TO_NAME(UndefinedLayer)
         ENUM_TO_NAME(CompareAnyLayer)
         ENUM_TO_NAME(CompareClearLayer)
         ENUM_TO_NAME(CompareOverlayLayer)
         ENUM_TO_NAME(OptimizeLayer)
         ENUM_TO_NAME(OptimizePlusLayer)
-#if defined(HAVE_COALESCELAYER)
         ENUM_TO_NAME(CoalesceLayer)
         ENUM_TO_NAME(DisposeLayer)
+#if defined(HAVE_ENUM_OPTIMIZETRANSLAYER)
+        ENUM_TO_NAME(OptimizeTransLayer)
+#endif
+#if defined(HAVE_ENUM_OPTIMIZEIMAGELAYER)
+        ENUM_TO_NAME(OptimizeImageLayer)
+#endif
+#if defined(HAVE_ENUM_REMOVEDUPSLAYER)
+        ENUM_TO_NAME(RemoveDupsLayer)
+#endif
+#if defined(HAVE_ENUM_REMOVEZEROLAYER)
+        ENUM_TO_NAME(RemoveZeroLayer)
 #endif
+#if defined(HAVE_ENUM_COMPOSITELAYER)
+        ENUM_TO_NAME(CompositeLayer)
+#endif
+#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
+
     }
+
+    return "UndefinedLayer";
 }
 
 VALUE
-MagickLayerMethod_new(MagickLayerMethod method)
+LAYERMETHODTYPE_NEW(LAYERMETHODTYPE method)
 {
-    const char *name;
-
-    name = MagickLayerMethod_name(method);
-    return rm_enum_new(Class_MagickLayerMethod, ID2SYM(rb_intern(name)), INT2FIX(method));
+    const char *name = LAYERMETHODTYPE_NAME(method);
+    return rm_enum_new(CLASS_LAYERMETHODTYPE, ID2SYM(rb_intern(name)), INT2FIX(method));
 }
-#endif
 
 
 /*
@@ -1722,7 +1746,6 @@ RenderingIntent_name(RenderingIntent intent)
 {
     switch(intent)
     {
-        default:
         ENUM_TO_NAME(UndefinedIntent)
         ENUM_TO_NAME(SaturationIntent)
         ENUM_TO_NAME(PerceptualIntent)
@@ -1730,6 +1753,7 @@ RenderingIntent_name(RenderingIntent intent)
         ENUM_TO_NAME(RelativeIntent)
     }
 
+    return "UndefinedIntent";
 }
 
 
@@ -1741,9 +1765,7 @@ RenderingIntent_name(RenderingIntent intent)
 VALUE
 RenderingIntent_new(RenderingIntent intent)
 {
-    const char *name;
-
-    name = RenderingIntent_name(intent);
+    const char *name = RenderingIntent_name(intent);
     return rm_enum_new(Class_RenderingIntent, ID2SYM(rb_intern(name)), INT2FIX(intent));
 }
 
@@ -1757,12 +1779,12 @@ ResolutionType_name(ResolutionType type)
 {
     switch(type)
     {
-        default:
         ENUM_TO_NAME(UndefinedResolution)
         ENUM_TO_NAME(PixelsPerInchResolution)
         ENUM_TO_NAME(PixelsPerCentimeterResolution)
     }
 
+    return "UndefinedResolution";
 }
 
 
@@ -1773,15 +1795,12 @@ ResolutionType_name(ResolutionType type)
 VALUE
 ResolutionType_new(ResolutionType type)
 {
-    const char *name;
-
-    name = ResolutionType_name(type);
+    const char *name = ResolutionType_name(type);
     return rm_enum_new(Class_ResolutionType, ID2SYM(rb_intern(name)), INT2FIX(type));
 }
 
 
 
-#if defined(HAVE_IMAGE_ORIENTATION)
 /*
     Static:     OrientationType_name
     Purpose:    Return the name of a OrientationType enum as a string
@@ -1791,7 +1810,6 @@ OrientationType_name(OrientationType type)
 {
     switch(type)
     {
-        default:
         ENUM_TO_NAME(UndefinedOrientation)
         ENUM_TO_NAME(TopLeftOrientation)
         ENUM_TO_NAME(TopRightOrientation)
@@ -1802,6 +1820,8 @@ OrientationType_name(OrientationType type)
         ENUM_TO_NAME(RightBottomOrientation)
         ENUM_TO_NAME(LeftBottomOrientation)
     }
+
+    return "UndefinedOrientation";
 }
 
 
@@ -1812,12 +1832,9 @@ OrientationType_name(OrientationType type)
 VALUE
 OrientationType_new(OrientationType type)
 {
-    const char *name;
-
-    name = OrientationType_name(type);
+    const char *name = OrientationType_name(type);
     return rm_enum_new(Class_OrientationType, ID2SYM(rb_intern(name)), INT2FIX(type));
 }
-#endif
 
 
 /*
@@ -1836,11 +1853,7 @@ Color_from_ColorInfo(const ColorInfo *ci)
 
     compliance_type = ci->compliance;
     compliance = ComplianceType_new(compliance_type);
-#if defined(HAVE_NEW_COLORINFO)
     color      = Pixel_from_MagickPixelPacket((MagickPixelPacket *)(&(ci->color)));
-#else
-    color      = Pixel_from_PixelPacket((PixelPacket *)(&(ci->color)));
-#endif
 
     return rb_funcall(Class_Color, rm_ID_new, 3
                     , name, compliance, color);
@@ -1870,7 +1883,7 @@ Color_to_ColorInfo(ColorInfo *ci, VALUE st)
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ci->name), STRING_PTR(m));
+        (void) CloneString((char **)&(ci->name), StringValuePtr(m));
     }
     m = rb_ary_entry(members, 1);
     if (m != Qnil)
@@ -1881,7 +1894,6 @@ Color_to_ColorInfo(ColorInfo *ci, VALUE st)
     if (m != Qnil)
     {
         Data_Get_Struct(m, Pixel, pixel);
-#if defined(HAVE_NEW_COLORINFO)
         // For >= 6.3.0, ColorInfo.color is a MagickPixelPacket so we have to
         // convert the PixelPacket.
         GetMagickPixelPacket(NULL, &ci->color);
@@ -1890,9 +1902,6 @@ Color_to_ColorInfo(ColorInfo *ci, VALUE st)
         ci->color.blue = (MagickRealType) pixel->blue;
         ci->color.opacity = (MagickRealType) OpaqueOpacity;
         ci->color.index = (MagickRealType) 0;
-#else
-        ci->color = *pixel;
-#endif
     }
 }
 
@@ -1919,19 +1928,15 @@ Color_to_s(VALUE self)
 
     Color_to_ColorInfo(&ci, self);
 
-#if defined(HAVE_NEW_COLORINFO)
     sprintf(buff, "name=%s, compliance=%s, "
-                  "color.red=%g, color.green=%g, color.blue=%g, color.opacity=%g ",
-                  ci.name,
-                  ComplianceType_name(&ci.compliance),
-                  ci.color.red, ci.color.green, ci.color.blue, ci.color.opacity);
+#if (QuantumDepth == 32 || QuantumDepth == 64) && defined(HAVE_TYPE_LONG_DOUBLE)
+                  "color.red=%Lg, color.green=%Lg, color.blue=%Lg, color.opacity=%Lg ",
 #else
-    sprintf(buff, "name=%s, compliance=%s, "
-                  "color.red=%d, color.green=%d, color.blue=%d, color.opacity=%d ",
+                  "color.red=%g, color.green=%g, color.blue=%g, color.opacity=%g ",
+#endif
                   ci.name,
                   ComplianceType_name(&ci.compliance),
                   ci.color.red, ci.color.green, ci.color.blue, ci.color.opacity);
-#endif
 
     destroy_ColorInfo(&ci);
     return rb_str_new2(buff);
@@ -1958,7 +1963,6 @@ Pixel_from_PixelPacket(PixelPacket *pp)
     Purpose:    Create a Magick::Pixel object from a MagickPixelPacket structure.
     Notes:      bypasses normal Pixel.new, Pixel#initialize methods
 */
-#if defined(HAVE_NEW_COLORINFO)
 static VALUE
 Pixel_from_MagickPixelPacket(MagickPixelPacket *pp)
 {
@@ -1972,7 +1976,6 @@ Pixel_from_MagickPixelPacket(MagickPixelPacket *pp)
 
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
 }
-#endif
 
 
 /*
@@ -2254,9 +2257,7 @@ Segment_to_SegmentInfo(SegmentInfo *segment, VALUE s)
 static VALUE
 StretchType_new(StretchType stretch)
 {
-    const char *name;
-
-    name = StretchType_name(stretch);
+    const char *name = StretchType_name(stretch);
     return rm_enum_new(Class_StretchType, ID2SYM(rb_intern(name)), INT2FIX(stretch));
 }
 
@@ -2268,9 +2269,7 @@ StretchType_new(StretchType stretch)
 static VALUE
 StyleType_new(StyleType style)
 {
-    const char *name;
-
-    name = StyleType_name(style);
+    const char *name = StyleType_name(style);
     return rm_enum_new(Class_StyleType, ID2SYM(rb_intern(name)), INT2FIX(style));
 }
 
@@ -2321,17 +2320,17 @@ Font_to_TypeInfo(TypeInfo *ti, VALUE st)
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->name), STRING_PTR(m));
+        (void) CloneString((char **)&(ti->name), StringValuePtr(m));
     }
     m = rb_ary_entry(members, 1);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->description), STRING_PTR(m));
+        (void) CloneString((char **)&(ti->description), StringValuePtr(m));
     }
     m = rb_ary_entry(members, 2);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->family), STRING_PTR(m));
+        (void) CloneString((char **)&(ti->family), StringValuePtr(m));
     }
     m = rb_ary_entry(members, 3); ti->style   = m == Qnil ? 0 : FIX2INT(m);
     m = rb_ary_entry(members, 4); ti->stretch = m == Qnil ? 0 : FIX2INT(m);
@@ -2339,13 +2338,13 @@ Font_to_TypeInfo(TypeInfo *ti, VALUE st)
 
     m = rb_ary_entry(members, 6);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->encoding), STRING_PTR(m));
+        (void) CloneString((char **)&(ti->encoding), StringValuePtr(m));
     m = rb_ary_entry(members, 7);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->foundry), STRING_PTR(m));
+        (void) CloneString((char **)&(ti->foundry), StringValuePtr(m));
     m = rb_ary_entry(members, 8);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->format), STRING_PTR(m));
+        (void) CloneString((char **)&(ti->format), StringValuePtr(m));
 }
 
 
@@ -2515,16 +2514,30 @@ VirtualPixelMethod_name(VirtualPixelMethod method)
 {
     switch (method)
     {
-        default:
         ENUM_TO_NAME(UndefinedVirtualPixelMethod)
         ENUM_TO_NAME(EdgeVirtualPixelMethod)
         ENUM_TO_NAME(MirrorVirtualPixelMethod)
         ENUM_TO_NAME(TileVirtualPixelMethod)
-#if defined(HAVE_TRANSPARENTVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(TransparentVirtualPixelMethod)
         ENUM_TO_NAME(BackgroundVirtualPixelMethod)
+        ENUM_TO_NAME(DitherVirtualPixelMethod)
+        ENUM_TO_NAME(RandomVirtualPixelMethod)
+        ENUM_TO_NAME(ConstantVirtualPixelMethod)
+#if defined(HAVE_ENUM_MASKVIRTUALPIXELMETHOD)
+        ENUM_TO_NAME(MaskVirtualPixelMethod)
+#endif
+#if defined(HAVE_ENUM_BLACKVIRTUALPIXELMETHOD)
+        ENUM_TO_NAME(BlackVirtualPixelMethod)
+#endif
+#if defined(HAVE_ENUM_GRAYVIRTUALPIXELMETHOD)
+        ENUM_TO_NAME(GrayVirtualPixelMethod)
+#endif
+#if defined(HAVE_ENUM_WHITEVIRTUALPIXELMETHOD)
+        ENUM_TO_NAME(WhiteVirtualPixelMethod)
 #endif
     }
+
+    return "UndefinedVirtualPixelMethod";
 }
 
 
@@ -2535,9 +2548,7 @@ VirtualPixelMethod_name(VirtualPixelMethod method)
 VALUE
 VirtualPixelMethod_new(VirtualPixelMethod style)
 {
-    const char *name;
-
-    name = VirtualPixelMethod_name(style);
+    const char *name = VirtualPixelMethod_name(style);
     return rm_enum_new(Class_VirtualPixelMethod, ID2SYM(rb_intern(name)), INT2FIX(style));
 }
 
@@ -2554,13 +2565,11 @@ VALUE rm_define_enum_type(char *tag)
 
     rb_define_singleton_method(class, "values", Enum_type_values, 0);
     rb_define_method(class, "initialize", Enum_type_initialize, 2);
-    RUBY16(rb_enable_super(class, "initialize");)
     rb_define_method(class, "inspect", Enum_type_inspect, 0);
     return class;
 }
 
 
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 /*
     Extern:  rm_enum_new (1.8)
     Purpose: Construct a new Enum subclass instance
@@ -2589,38 +2598,6 @@ VALUE Enum_alloc(VALUE class)
 }
 
 
-#else
-/*
-    Extern:  rm_enum_new (1.6)
-    Purpose: Construct a new Enum subclass instance
-*/
-VALUE rm_enum_new(VALUE class, VALUE sym, VALUE val)
-{
-    return Enum_new(class, sym, val);
-}
-
-/*
-    Method:  Enum.new
-    Purpose: Construct a new Enum object
-    Notes:   `class' can be an Enum subclass
-*/
-VALUE Enum_new(VALUE class, VALUE sym, VALUE val)
-{
-    volatile VALUE new_enum;
-    volatile VALUE argv[2];
-    MagickEnum *magick_enum;
-
-    new_enum = Data_Make_Struct(class, MagickEnum, NULL, NULL, magick_enum);
-    argv[0] = sym;
-    argv[1] = val;
-
-    rb_obj_call_init(new_enum, 2, argv);
-    OBJ_FREEZE(new_enum);
-    return new_enum;
-}
-
-#endif
-
 /*
     Method:  Enum#initialize
     Purpose: Initialize a new Enum instance
@@ -2718,17 +2695,20 @@ VALUE Enum_case_eq(VALUE self, VALUE other)
 */
 VALUE Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
 {
-    VALUE super_argv[2];
+    volatile VALUE super_argv[2];
     volatile VALUE enumerators;
 
     super_argv[0] = sym;
     super_argv[1] = val;
-    (void) rb_call_super(2, super_argv);
+    (void) rb_call_super(2, (VALUE *)super_argv);
 
     if (rb_cvar_defined(CLASS_OF(self), rm_ID_enumerators) != Qtrue)
     {
-        RUBY18(rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new(), 0));
-        RUBY16(rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new()));
+#if defined(HAVE_NEW_RB_CVAR_SET)
+        rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new());
+#else
+        rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new(), 0);
+#endif
     }
 
     enumerators = rb_cvar_get(CLASS_OF(self), rm_ID_enumerators);
@@ -2833,51 +2813,6 @@ ComplianceType_name(ComplianceType *c)
 }
 
 
-#if defined(HAVE_GETIMAGESTATISTICS)
-/*
-    Extern:     Statistics_new(stats)
-    Purpose:    Create a Magick::Statistics object from an
-                ImageStatistics structure.
-*/
-VALUE
-Statistics_new(ImageStatistics *stats)
-{
-    volatile VALUE red, green, blue, opacity;
-    volatile VALUE min, max, mean, stddev, var;
-
-    min = rb_float_new(stats->red.minimum);
-    max = rb_float_new(stats->red.maximum);
-    mean = rb_float_new(stats->red.mean);
-    stddev = rb_float_new(stats->red.standard_deviation);
-    var = rb_float_new(stats->red.variance);
-    red = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
-
-    min = rb_float_new(stats->green.minimum);
-    max = rb_float_new(stats->green.maximum);
-    mean = rb_float_new(stats->green.mean);
-    stddev = rb_float_new(stats->green.standard_deviation);
-    var = rb_float_new(stats->green.variance);
-    green = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
-
-    min = rb_float_new(stats->blue.minimum);
-    max = rb_float_new(stats->blue.maximum);
-    mean = rb_float_new(stats->blue.mean);
-    stddev = rb_float_new(stats->blue.standard_deviation);
-    var = rb_float_new(stats->blue.variance);
-    blue = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
-
-    min = rb_float_new(stats->opacity.minimum);
-    max = rb_float_new(stats->opacity.maximum);
-    mean = rb_float_new(stats->opacity.mean);
-    stddev = rb_float_new(stats->opacity.standard_deviation);
-    var = rb_float_new(stats->opacity.variance);
-    opacity = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
-
-    return rb_funcall(Class_Statistics, rm_ID_new, 4, red, green, blue, opacity);
-
-}
-#endif  // HAVE_GETIMAGESTATISTICS
-
 /*
     Extern:     StorageType_name
     Purpose:    Return the string representation of a StorageType value
@@ -2887,22 +2822,17 @@ StorageType_name(StorageType type)
 {
     switch (type)
     {
+        ENUM_TO_NAME(UndefinedPixel)
         ENUM_TO_NAME(CharPixel)
         ENUM_TO_NAME(DoublePixel)
         ENUM_TO_NAME(FloatPixel)
         ENUM_TO_NAME(IntegerPixel)
         ENUM_TO_NAME(LongPixel)
-#if defined(HAVE_QUANTUMPIXEL)
         ENUM_TO_NAME(QuantumPixel)
-#endif
         ENUM_TO_NAME(ShortPixel)
-        default:
-#if defined(HAVE_UNDEFINEDGRAVITY)      // UndefinedGravity & UndefinedPixel were both introduced in IM 6.0.0
-        ENUM_TO_NAME(UndefinedPixel)
-#else
-        return "UndefinedPixel";
-#endif
     }
+
+    return "UndefinedPixel";
 }
 
 /*
@@ -2914,6 +2844,7 @@ StretchType_name(StretchType stretch)
 {
     switch (stretch)
     {
+        ENUM_TO_NAME(UndefinedStretch)
         ENUM_TO_NAME(NormalStretch)
         ENUM_TO_NAME(UltraCondensedStretch)
         ENUM_TO_NAME(ExtraCondensedStretch)
@@ -2924,13 +2855,9 @@ StretchType_name(StretchType stretch)
         ENUM_TO_NAME(ExtraExpandedStretch)
         ENUM_TO_NAME(UltraExpandedStretch)
         ENUM_TO_NAME(AnyStretch)
-        default:
-#if defined(HAVE_UNDEFINEDGRAVITY)      // UndefinedGravity & UndefinedStretch were both introduced in IM 6.0.0
-        ENUM_TO_NAME(UndefinedStretch)
-#else
-        return "UndefinedStretch";
-#endif
     }
+
+    return "UndefinedStretch";
 }
 
 
@@ -2943,17 +2870,14 @@ StyleType_name(StyleType style)
 {
     switch (style)
     {
+        ENUM_TO_NAME(UndefinedStyle)
         ENUM_TO_NAME(NormalStyle)
         ENUM_TO_NAME(ItalicStyle)
         ENUM_TO_NAME(ObliqueStyle)
         ENUM_TO_NAME(AnyStyle)
-        default:
-#if defined(HAVE_UNDEFINEDGRAVITY)      // UndefinedGravity & UndefinedStyle were both introduced in IM 6.0.0
-        ENUM_TO_NAME(UndefinedStyle)
-#else
-        return "UndefinedStyle";
-#endif
     }
+
+    return "UndefinedStyle";
 }
 
 
@@ -2990,8 +2914,11 @@ rm_write_temp_image(Image *image, char *tmpnam)
     }
 
     id += 1;
-    RUBY16(rb_cvar_set(Module_Magick, rm_ID__tmpnam_, INT2FIX(id));)
-    RUBY18(rb_cvar_set(Module_Magick, rm_ID__tmpnam_, INT2FIX(id), 0);)
+#if defined(HAVE_NEW_RB_CVAR_SET)
+    rb_cvar_set(Module_Magick, rm_ID__tmpnam_, INT2FIX(id));
+#else
+    rb_cvar_set(Module_Magick, rm_ID__tmpnam_, INT2FIX(id), 0);
+#endif
 
     sprintf(tmpnam, "mpri:%d", id);
 
@@ -3008,12 +2935,9 @@ rm_write_temp_image(Image *image, char *tmpnam)
 
     long registry_id;
 
-#if !defined(GRAPHICSMAGICK)
-    /* This leak doesn't occur in GraphicsMagick as far as I know. */
-    rb_warn("`%s' can cause memory leaks when RMagick was built with " Q(MAGICKNAME) " " MagickLibVersionText
-            ".\nUpgrade to ImageMagick 6.3.4 or later to prevent this behavior."
-          , rb_id2name(rb_frame_last_func()));
-#endif
+    rb_warn("`%s' can cause memory leaks with ImageMagick "  MagickLibVersionText
+            ".\nUpgrade to ImageMagick 6.3.4-10 or later to prevent this behavior."
+          , rb_id2name(THIS_FUNC()));
 
     registry_id = SetMagickRegistry(ImageRegistryType, image, sizeof(Image), &image->exception);
     rm_check_image_exception(image, RetainOnError);
@@ -3021,6 +2945,7 @@ rm_write_temp_image(Image *image, char *tmpnam)
     {
         rb_raise(rb_eRuntimeError, "SetMagickRegistry failed.");
     }
+
     sprintf(tmpnam, "mpri:%ld", registry_id);
 #endif
 
@@ -3051,7 +2976,6 @@ rm_delete_temp_image(char *tmpnam)
         (void) DeleteMagickRegistry(registry_id);
     }
 #endif
-
 }
 
 /*
@@ -3059,16 +2983,13 @@ rm_delete_temp_image(char *tmpnam)
     Purpose:    raise NotImplementedError
     Notes:      Called when a xMagick API is not available.
                 Replaces Ruby's rb_notimplement function.
-    Notes:      The MagickPackageName macro is not available
-                until 5.5.7. Use MAGICKNAME instead.
 */
 void
 rm_not_implemented(void)
 {
 
-    rb_raise(rb_eNotImpError, "the `%s' method is not supported by "
-                              Q(MAGICKNAME) " " MagickLibVersionText
-                              , rb_id2name(rb_frame_last_func()));
+    rb_raise(rb_eNotImpError, "the `%s' method is not supported by ImageMagick "
+            MagickLibVersionText, rb_id2name(THIS_FUNC()));
 }
 
 /*
@@ -3100,7 +3021,7 @@ rm_magick_error(const char *msg, const char *loc)
 VALUE
 ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE super_argv[1] = {(VALUE)0};
+    volatile VALUE super_argv[1] = {(VALUE)0};
     int super_argc = 0;
     volatile VALUE extra = Qnil;
 
@@ -3117,7 +3038,7 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 to 2)", argc);
     }
 
-    (void) rb_call_super(super_argc, super_argv);
+    (void) rb_call_super(super_argc, (VALUE *)super_argv);
     (void) rb_iv_set(self, "@"MAGICK_LOC, extra);
 
 
@@ -3146,10 +3067,10 @@ 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
 */
-unsigned int 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 (unsigned int) SetImageProperty(image, property, value);
+    return SetImageProperty(image, property, value);
 #else
     return SetImageAttribute(image, property, value);
 #endif
@@ -3239,8 +3160,8 @@ rm_exif_by_entry(Image *image)
 
 #else
 
-    const ImageAttribute *attr = GetImageAttribute(image, "EXIF:*");
-    return attr ? rb_str_new2(attr->value) : Qnil;
+    const char *attr = rm_get_property(image, "EXIF:*");
+    return attr ? rb_str_new2(attr) : Qnil;
 
 #endif
 }
@@ -3329,15 +3250,15 @@ rm_exif_by_number(Image *image)
 
 #else
 
-    const ImageAttribute *attr = GetImageAttribute(image, "EXIF:!");
-    return attr ? rb_str_new2(attr->value) : Qnil;
+    const char *attr = rm_get_property(image, "EXIF:!");
+    return attr ? rb_str_new2(attr) : Qnil;
 
 #endif
 }
 
 
 /*
- *  Extern:     get_geometry
+ *  Extern:     rm_get_geometry
  *  Purpose:    Get the values from a Geometry object and return
  *              them in C variables.
 */
@@ -3389,6 +3310,8 @@ rm_get_geometry(
 /*
  *  Extern:     rm_clone_image
  *  Purpose:    clone an image, handle errors
+ *  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)
 {
@@ -3413,7 +3336,6 @@ 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.
 */
-#if defined(HAVE_SETIMAGEPROGRESSMONITOR)
 MagickBooleanType rm_progress_monitor(
     const char *tag,
     const MagickOffsetType of,
@@ -3423,7 +3345,7 @@ MagickBooleanType rm_progress_monitor(
     volatile VALUE rval;
     volatile VALUE method, offset, span;
 
-    tag = tag;                  // defeat gcc message
+    tag = tag;      // defeat gcc message
 
 #if defined(HAVE_LONG_LONG)     // defined in Ruby's defines.h
     offset = rb_ll2inum(of);
@@ -3433,13 +3355,12 @@ MagickBooleanType rm_progress_monitor(
     span = rb_uint2big((unsigned long)sp);
 #endif
 
-    method = rb_str_new2(rb_id2name(rb_frame_last_func()));
+    method = rb_str_new2(rb_id2name(THIS_FUNC()));
 
     rval = rb_funcall((VALUE)client_data, rm_ID_call, 3, method, offset, span);
 
     return RTEST(rval) ? MagickTrue : MagickFalse;
 }
-#endif
 
 
 /*
@@ -3463,107 +3384,6 @@ rm_split(Image *image)
 }
 
 
-
-/*
- *  Static:     copy_exception
- *              clear_exception
- *  Purpose:    Define alternative implementations of ImageMagick's
- *              InheritException and ClearMagickException.
- *  Notes:      InheritException is ALWAYS defined in ImageMagick and
- *              NEVER defined in GraphicsMagick. ClearMagickException
- *              is defined in ImageMagick 6.2.6 and later and NEVER
- *              defined in GraphicsMagick.
- *
- *              The purpose of InheritException is to copy the exception
- *              information from a "related" exception to a destination
- *              exception if the related exception is more severe than the
- *              destination exception.
- *
- *              The purpose of ClearException is to reset the ExceptionInfo
- *              structure to its initial format.
- */
-
-#if defined(HAVE_INHERITEXCEPTION)
-
-    // This is ImageMagick - InheritException is always defined
-    static void copy_exception(ExceptionInfo *exception, ExceptionInfo *relative)
-    {
-        InheritException(exception, relative);
-    }
-
-    // ImageMagick < 6.2.6 had a different kind of ExceptionInfo struct
-    // and doesn't define ClearMagickException.
-    #if defined(HAVE_CLEARMAGICKEXCEPTION)
-        static void clear_exception(ExceptionInfo *exception)
-        {
-           ClearMagickException(exception);
-        }
-    #else
-
-        static void clear_exception(ExceptionInfo *exception)
-        {
-            DestroyExceptionInfo(exception);
-            GetExceptionInfo(exception);
-        }
-
-    #endif
-
-
-#else   // !defined(HAVE_INHERITEXCEPTION)
-
-    // This is GraphicsMagick. Very old versions don't support the
-    // module, function, and line fields in the ExceptionInfo struct.
-
-    static void copy_exception(ExceptionInfo *exception, ExceptionInfo *relative)
-    {
-        assert(exception != NULL);
-        assert(exception->signature == MagickSignature);
-        assert(relative != NULL);
-
-        if (relative->severity < exception->severity)
-        {
-          return;
-        }
-
-        DestroyExceptionInfo(exception);
-        GetExceptionInfo(exception);
-
-        exception->severity = relative->severity;
-        if (relative->reason)
-        {
-          magick_clone_string(&exception->reason, relative->reason);
-        }
-
-        if (relative->description)
-        {
-          magick_clone_string(&exception->description, relative->description);
-        }
-
-
-        #if defined(HAVE_EXCEPTIONINFO_MODULE)
-            if (relative->module)
-            {
-              magick_clone_string(&exception->module, relative->module);
-            }
-            if (relative->function)
-            {
-              magick_clone_string(&exception->function, relative->function);
-            }
-
-            exception->line = relative->line;
-        #endif
-    }
-
-
-    static void clear_exception(ExceptionInfo *exception)
-    {
-        DestroyExceptionInfo(exception);
-        GetExceptionInfo(exception);
-    }
-
-#endif
-
-
 /*
     Extern:     rm_check_image_exception
     Purpose:    If an ExceptionInfo struct in a list of images indicates a warning,
@@ -3593,10 +3413,10 @@ rm_check_image_exception(Image *imglist, ErrorRetention retention)
             if (!badboy || image->exception.severity > badboy->exception.severity)
             {
                 badboy = image;
-                copy_exception(&exception, &badboy->exception);
+                InheritException(&exception, &badboy->exception);
             }
 
-            clear_exception(&image->exception);
+            ClearMagickException(&image->exception);
         }
         image = GetNextImageInList(image);
     }
@@ -3641,13 +3461,6 @@ handle_exception(ExceptionInfo *exception, Image *imglist, ErrorRetention retent
     char desc[500];
     char msg[sizeof(reason)+sizeof(desc)+20];
 
-#if defined(HAVE_EXCEPTIONINFO_MODULE)
-    char module[200], function[200];
-    char extra[sizeof(module)+sizeof(function)+20];
-    unsigned long line;
-#endif
-
-
     memset(msg, 0, sizeof(msg));
 
 
@@ -3719,40 +3532,8 @@ handle_exception(ExceptionInfo *exception, Image *imglist, ErrorRetention retent
 
     msg[sizeof(msg)-1] = '\0';
 
-
-#if defined(HAVE_EXCEPTIONINFO_MODULE)
-
-    memset(module, 0, sizeof(module));
-    memset(function, 0, sizeof(function));
-    memset(extra, 0, sizeof(extra));
-
-    if (exception->module)
-    {
-        strncpy(module, exception->module, sizeof(module)-1);
-        module[sizeof(module)-1] = '\0';
-    }
-    if (exception->function)
-    {
-        strncpy(function, exception->function, sizeof(function)-1);
-        function[sizeof(function)-1] = '\0';
-    }
-    line = exception->line;
-
-#if defined(HAVE_SNPRINTF)
-     snprintf(extra, sizeof(extra)-1, "%s at %s:%lu", function, module, line);
-#else
-     sprintf(extra, "%.*s at %.*s:%lu", sizeof(function), function, sizeof(module), module, line);
-#endif
-
-     extra[sizeof(extra)-1] = '\0';
-
-     (void) DestroyExceptionInfo(exception);
-     rm_magick_error(msg, extra);
-
-#else
-     (void) DestroyExceptionInfo(exception);
-     rm_magick_error(msg, NULL);
-#endif
+    (void) DestroyExceptionInfo(exception);
+    rm_magick_error(msg, NULL);
 
 }