rmagick 3.0.0 → 3.1.0

data/ext/RMagick/rmimage.c

@@ -11,7 +11,6 @@
  ******************************************************************************/
 
 #include "rmagick.h"
-#include "magick/xwindow.h"     // XImageInfo
 
 /** Method that effects an image */
 typedef Image *(effector_t)(const Image *, const double, const double, ExceptionInfo *);
@@ -591,40 +590,8 @@ Image_alpha(int argc, VALUE *argv, VALUE self)
     image = rm_check_frozen(self);
     VALUE_TO_ENUM(argv[0], alpha, AlphaChannelType);
 
-#if defined(HAVE_SETIMAGEALPHACHANNEL)
-    // Added in 6.3.6-9
     (void) SetImageAlphaChannel(image, alpha);
     rm_check_image_exception(image, RetainOnError);
-#else
-    switch (alpha)
-    {
-        case ActivateAlphaChannel:
-            image->matte = MagickTrue;
-            break;
-
-        case DeactivateAlphaChannel:
-            image->matte = MagickFalse;
-            break;
-
-        case ResetAlphaChannel:
-            if (image->matte == MagickFalse)
-            {
-                (void) SetImageOpacity(image, OpaqueOpacity);
-                rm_check_image_exception(image, RetainOnError);
-            }
-            break;
-
-        case SetAlphaChannel:
-            (void) CompositeImage(image, CopyOpacityCompositeOp, image, 0, 0);
-            rm_check_image_exception(image, RetainOnError);
-            break;
-
-        default:
-            rb_raise(rb_eArgError, "unknown AlphaChannelType value");
-            break;
-    }
-#endif
-
     return argv[0];
 }
 
@@ -646,11 +613,7 @@ VALUE
 Image_alpha_q(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-#if defined(HAVE_GETIMAGEALPHACHANNEL)
     return GetImageAlphaChannel(image) ? Qtrue : Qfalse;
-#else
-    return image->matte ? Qtrue : Qfalse;
-#endif
 }
 
 
@@ -672,6 +635,7 @@ Image_alpha_eq(VALUE self, VALUE type)
 {
     VALUE argv[1];
     argv[0] = type;
+    rb_warning("Image#alpha= is deprecated; use Image#alpha.");
     Image_alpha(1, argv, self);
     return type;
 }
@@ -922,15 +886,7 @@ auto_channel(int argc, VALUE *argv, VALUE self, MagickBooleanType (*fp)(Image *,
 VALUE
 Image_auto_gamma_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_AUTOGAMMAIMAGECHANNEL)
     return auto_channel(argc, argv, self, AutoGammaImageChannel);
-#else
-    rm_not_implemented();
-    return (VALUE) 0;
-    argc = argc;
-    argv = argv;
-    self = self;
-#endif
 }
 
 
@@ -951,15 +907,7 @@ Image_auto_gamma_channel(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_auto_level_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_AUTOLEVELIMAGECHANNEL)
     return auto_channel(argc, argv, self, AutoLevelImageChannel);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    argc = argc;
-    argv = argv;
-    self = self;
-#endif
 }
 
 
@@ -1081,7 +1029,7 @@ VALUE
 Image_background_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return rm_pixelpacket_to_color_name(image, &image->background_color);
+    return rm_pixelcolor_to_color_name(image, &image->background_color);
 }
 
 
@@ -1099,7 +1047,7 @@ VALUE
 Image_background_color_eq(VALUE self, VALUE color)
 {
     Image *image = rm_check_frozen(self);
-    Color_to_PixelPacket(&image->background_color, color);
+    Color_to_PixelColor(&image->background_color, color);
     return self;
 }
 
@@ -1220,6 +1168,7 @@ Image_bilevel_channel(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
     ChannelType channels;
+    double threshold;
 
     image = rm_check_destroyed(self);
     channels = extract_channels(&argc, argv);
@@ -1233,9 +1182,10 @@ Image_bilevel_channel(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "no threshold specified");
     }
 
+    threshold = NUM2DBL(argv[0]);
     new_image = rm_clone_image(image);
 
-    (void)BilevelImageChannel(new_image, channels, NUM2DBL(argv[0]));
+    (void)BilevelImageChannel(new_image, channels, threshold);
     rm_check_image_exception(new_image, DestroyOnError);
 
     return rm_image_new(new_image);
@@ -1625,9 +1575,7 @@ special_composite(Image *image, Image *overlay, double image_pct, double overlay
 
     blend_geometry(geometry, sizeof(geometry), image_pct, overlay_pct);
     (void) CloneString(&overlay->geometry, geometry);
-#if defined(HAVE_SETIMAGEARTIFACT)
     (void) SetImageArtifact(overlay,"compose:args", geometry);
-#endif
 
     new_image = rm_clone_image(image);
     (void) CompositeImage(new_image, op, overlay, x_off, y_off);
@@ -1727,7 +1675,6 @@ Image_blend(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_blue_shift(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_BLUESHIFTIMAGE)
     Image *image, *new_image;
     double factor = 1.5;
     ExceptionInfo *exception;
@@ -1752,13 +1699,6 @@ Image_blue_shift(int argc, VALUE *argv, VALUE self)
     DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    argc = argc;
-    argv = argv;
-    self = self;
-#endif
 }
 
 
@@ -1866,7 +1806,7 @@ static VALUE
 border(int bang, VALUE self, VALUE width, VALUE height, VALUE color)
 {
     Image *image, *new_image;
-    PixelPacket old_border;
+    PixelColor old_border;
     ExceptionInfo *exception;
     RectangleInfo rect;
 
@@ -1878,7 +1818,7 @@ border(int bang, VALUE self, VALUE width, VALUE height, VALUE color)
 
     // Save current border color - we'll want to restore it afterwards.
     old_border = image->border_color;
-    Color_to_PixelPacket(&image->border_color, color);
+    Color_to_PixelColor(&image->border_color, color);
 
     exception = AcquireExceptionInfo();
     new_image = BorderImage(image, &rect, exception);
@@ -1959,7 +1899,7 @@ VALUE
 Image_border_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return rm_pixelpacket_to_color_name(image, &image->border_color);
+    return rm_pixelcolor_to_color_name(image, &image->border_color);
 }
 
 
@@ -1977,7 +1917,7 @@ VALUE
 Image_border_color_eq(VALUE self, VALUE color)
 {
     Image *image = rm_check_frozen(self);
-    Color_to_PixelPacket(&image->border_color, color);
+    Color_to_PixelColor(&image->border_color, color);
     return self;
 }
 
@@ -2590,10 +2530,7 @@ Image_color_histogram(VALUE self)
     if (image->storage_class != DirectClass)
     {
         dc_copy = rm_clone_image(image);
-        (void) SyncImage(dc_copy);
-        magick_free(dc_copy->colormap);
-        dc_copy->colormap = NULL;
-        dc_copy->storage_class = DirectClass;
+        (void) SetImageStorageClass(dc_copy, DirectClass);
         image = dc_copy;
     }
 
@@ -2608,18 +2545,21 @@ Image_color_histogram(VALUE self)
         }
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
-    if (exception->severity != UndefinedException)
+    if (rm_should_raise_exception(exception, DestroyExceptionRetention))
     {
         (void) RelinquishMagickMemory(histogram);
-        rm_check_exception(exception, dc_copy, DestroyOnError);
-    }
+        if (dc_copy)
+        {
+            (void) DestroyImage(dc_copy);
+        }
 
-    (void) DestroyExceptionInfo(exception);
+        rm_raise_exception(exception);
+    }
 
     hash = rb_hash_new();
     for (x = 0; x < colors; x++)
     {
-        pixel = Pixel_from_PixelPacket(&histogram[x].pixel);
+        pixel = Pixel_from_PixelColor(&histogram[x].pixel);
         (void) rb_hash_aset(hash, pixel, ULONG2NUM((unsigned long)histogram[x].count));
     }
 
@@ -2671,6 +2611,11 @@ set_profile(VALUE self, const char *name, VALUE profile)
     exception = AcquireExceptionInfo();
     m = GetMagickInfo(name, exception);
     CHECK_EXCEPTION()
+    if (!m)
+    {
+        (void) DestroyExceptionInfo(exception);
+        rb_raise(rb_eArgError, "unknown name: %s", name);
+    }
 
     info = CloneImageInfo(NULL);
     if (!info)
@@ -2690,14 +2635,21 @@ set_profile(VALUE self, const char *name, VALUE profile)
     profile_name = GetNextImageProfile(profile_image);
     while (profile_name)
     {
-        if (rm_strcasecmp(profile_name, name) == 0)
+        /* Hack for versions of ImageMagick where the meta coder would change the iptc profile into an 8bim profile */
+        if (rm_strcasecmp("8bim", profile_name) == 0 && rm_strcasecmp("iptc", name) == 0)
+        {
+            (void) ProfileImage(image, name, profile_blob, profile_length, MagickFalse);
+            if (image->exception.severity >= ErrorException)
+            {
+                break;
+            }
+        }
+        else if (rm_strcasecmp(profile_name, name) == 0)
         {
             profile_data = GetImageProfile(profile_image, profile_name);
-            if (profile)
+            if (profile_data)
             {
-                (void)ProfileImage(image, profile_name, profile_data->datum
-                                   , (unsigned long)profile_data->length
-                                   , (MagickBooleanType)MagickFalse);
+                (void) ProfileImage(image, name, GetStringInfoDatum(profile_data), GetStringInfoLength(profile_data), MagickFalse);
                 if (image->exception.severity >= ErrorException)
                 {
                     break;
@@ -2797,18 +2749,20 @@ Image_color_flood_fill( VALUE self, VALUE target_color, VALUE fill_color
                         , VALUE xv, VALUE yv, VALUE method)
 {
     Image *image, *new_image;
-    PixelPacket target;
+    PixelColor target;
     DrawInfo *draw_info;
-    PixelPacket fill;
+    PixelColor fill;
     long x, y;
     int fill_method;
+    MagickPixel target_mpp;
+    MagickBooleanType invert;
 
     image = rm_check_destroyed(self);
 
     // The target and fill args can be either a color name or
     // a Magick::Pixel.
-    Color_to_PixelPacket(&target, target_color);
-    Color_to_PixelPacket(&fill, fill_color);
+    Color_to_PixelColor(&target, target_color);
+    Color_to_PixelColor(&fill, fill_color);
 
     x = NUM2LONG(xv);
     y = NUM2LONG(yv);
@@ -2834,32 +2788,24 @@ Image_color_flood_fill( VALUE self, VALUE target_color, VALUE fill_color
 
     new_image = rm_clone_image(image);
 
-#if defined(HAVE_FLOODFILLPAINTIMAGE)
+    rm_init_magickpixel(new_image, &target_mpp);
+    if (fill_method == FillToBorderMethod)
     {
-        MagickPixelPacket target_mpp;
-        MagickBooleanType invert;
+        invert = MagickTrue;
+        target_mpp.red   = (MagickRealType) image->border_color.red;
+        target_mpp.green = (MagickRealType) image->border_color.green;
+        target_mpp.blue  = (MagickRealType) image->border_color.blue;
+    }
+    else
+    {
+        invert = MagickFalse;
+        target_mpp.red   = (MagickRealType) target.red;
+        target_mpp.green = (MagickRealType) target.green;
+        target_mpp.blue  = (MagickRealType) target.blue;
+    }
 
-        GetMagickPixelPacket(new_image, &target_mpp);
-        if (fill_method == FillToBorderMethod)
-        {
-            invert = MagickTrue;
-            target_mpp.red   = (MagickRealType) image->border_color.red;
-            target_mpp.green = (MagickRealType) image->border_color.green;
-            target_mpp.blue  = (MagickRealType) image->border_color.blue;
-        }
-        else
-        {
-            invert = MagickFalse;
-            target_mpp.red   = (MagickRealType) target.red;
-            target_mpp.green = (MagickRealType) target.green;
-            target_mpp.blue  = (MagickRealType) target.blue;
-        }
+    (void) FloodfillPaintImage(new_image, DefaultChannels, draw_info, &target_mpp, x, y, invert);
 
-        (void) FloodfillPaintImage(new_image, DefaultChannels, draw_info, &target_mpp, x, y, invert);
-    }
-#else
-    (void) ColorFloodfillImage(new_image, draw_info, target, x, y, (PaintMethod)fill_method);
-#endif
     // No need to check for error
 
     (void) DestroyDrawInfo(draw_info);
@@ -2886,7 +2832,7 @@ Image_colorize(int argc, VALUE *argv, VALUE self)
     Image *image, *new_image;
     double red, green, blue, matte;
     char opacity[50];
-    PixelPacket target;
+    PixelColor target;
     ExceptionInfo *exception;
 
     image = rm_check_destroyed(self);
@@ -2896,7 +2842,7 @@ Image_colorize(int argc, VALUE *argv, VALUE self)
         red   = floor(100*NUM2DBL(argv[0])+0.5);
         green = floor(100*NUM2DBL(argv[1])+0.5);
         blue  = floor(100*NUM2DBL(argv[2])+0.5);
-        Color_to_PixelPacket(&target, argv[3]);
+        Color_to_PixelColor(&target, argv[3]);
         sprintf(opacity, "%f/%f/%f", red, green, blue);
     }
     else if (argc == 5)
@@ -2905,7 +2851,7 @@ Image_colorize(int argc, VALUE *argv, VALUE self)
         green = floor(100*NUM2DBL(argv[1])+0.5);
         blue  = floor(100*NUM2DBL(argv[2])+0.5);
         matte = floor(100*NUM2DBL(argv[3])+0.5);
-        Color_to_PixelPacket(&target, argv[4]);
+        Color_to_PixelColor(&target, argv[4]);
         sprintf(opacity, "%f/%f/%f/%f", red, green, blue, matte);
     }
     else
@@ -2946,7 +2892,7 @@ Image_colormap(int argc, VALUE *argv, VALUE self)
 {
     Image *image;
     unsigned long idx;
-    PixelPacket color, new_color;
+    PixelColor color, new_color;
 
     image = rm_check_destroyed(self);
 
@@ -2975,7 +2921,7 @@ Image_colormap(int argc, VALUE *argv, VALUE self)
         {
             rb_raise(rb_eIndexError, "index out of range");
         }
-        return rm_pixelpacket_to_color_name(image, &image->colormap[idx]);
+        return rm_pixelcolor_to_color_name(image, &image->colormap[idx]);
     }
 
     // This is a "set" operation. Things are different.
@@ -2984,24 +2930,24 @@ Image_colormap(int argc, VALUE *argv, VALUE self)
 
     // Replace with new color? The arg can be either a color name or
     // a Magick::Pixel.
-    Color_to_PixelPacket(&new_color, argv[1]);
+    Color_to_PixelColor(&new_color, argv[1]);
 
     // Handle no colormap or current colormap too small.
     if (!image->colormap || idx > image->colors-1)
     {
-        PixelPacket black;
+        PixelColor black;
         unsigned long i;
 
         memset(&black, 0, sizeof(black));
 
         if (!image->colormap)
         {
-            image->colormap = (PixelPacket *)magick_safe_malloc((idx+1), sizeof(PixelPacket));
+            image->colormap = (PixelColor *)magick_safe_malloc((idx+1), sizeof(PixelColor));
             image->colors = 0;
         }
         else
         {
-            image->colormap = (PixelPacket *)magick_safe_realloc(image->colormap, (idx+1), sizeof(PixelPacket));
+            image->colormap = (PixelColor *)magick_safe_realloc(image->colormap, (idx+1), sizeof(PixelColor));
         }
 
         for (i = image->colors; i < idx; i++)
@@ -3015,7 +2961,7 @@ Image_colormap(int argc, VALUE *argv, VALUE self)
     color = image->colormap[idx];
     image->colormap[idx] = new_color;
 
-    return rm_pixelpacket_to_color_name(image, &color);
+    return rm_pixelcolor_to_color_name(image, &color);
 }
 
 /**
@@ -3070,11 +3016,7 @@ Image_colorspace_eq(VALUE self, VALUE colorspace)
 
     image = rm_check_frozen(self);
     VALUE_TO_ENUM(colorspace, new_cs, ColorspaceType);
-#if defined(HAVE_TRANSFORMIMAGECOLORSPACE)
     (void) TransformImageColorspace(image, new_cs);
-#else
-    (void) SetImageColorspace(image, new_cs);
-#endif
 
     return self;
 }
@@ -3521,9 +3463,10 @@ Image_composite_affine(VALUE self, VALUE source, VALUE affine_matrix)
 
     image = rm_check_destroyed(self);
     composite_image = rm_check_destroyed(source);
-    new_image = rm_clone_image(image);
 
     Export_AffineMatrix(&affine, affine_matrix);
+    new_image = rm_clone_image(image);
+
     (void) DrawAffineImage(new_image, composite_image, &affine);
     rm_check_image_exception(new_image, DestroyOnError);
 
@@ -3635,7 +3578,6 @@ Image_composite_channel_bang(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_composite_mathematics(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_ENUM_MATHEMATICSCOMPOSITEOP)
     Image *composite_image;
     VALUE args[5];
     signed long x_off = 0L;
@@ -3680,14 +3622,6 @@ Image_composite_mathematics(int argc, VALUE *argv, VALUE self)
     args[4] = CompositeOperator_new(MathematicsCompositeOp);
 
     return composite(False, 5, args, self, DefaultChannels);
-
-#else
-    rm_not_implemented();
-    argc = argc;
-    argv = argv;
-    self = self;
-    return (VALUE)0;
-#endif
 }
 
 
@@ -3756,11 +3690,7 @@ composite_tiled(int bang, int argc, VALUE *argv, VALUE self)
         image = rm_clone_image(image);
     }
 
-#if defined(HAVE_SETIMAGEARTIFACT)
     (void) SetImageArtifact(comp_image,"modify-outside-overlay", "false");
-#else
-    (void) SetImageAttribute(comp_image, "[modify-outside-overlay]", "false");
-#endif
 
     status = MagickTrue;
     columns = comp_image->columns;
@@ -3874,9 +3804,15 @@ Image_compression_eq(VALUE self, VALUE compression)
 VALUE
 Image_compress_colormap_bang(VALUE self)
 {
+    MagickBooleanType okay;
+
     Image *image = rm_check_frozen(self);
-    (void) CompressImageColormap(image);
+    okay = CompressImageColormap(image);
     rm_check_image_exception(image, RetainOnError);
+    if (!okay)
+    {
+        rb_warning("CompressImageColormap failed (probably DirectClass image)");
+    }
 
     return self;
 }
@@ -3910,7 +3846,6 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
                  , VALUE map_arg, VALUE pixels_arg)
 {
     Image *image;
-    ExceptionInfo *exception;
     VALUE pixel, pixel0;
     unsigned long width, height;
     long x, npixels;
@@ -3978,6 +3913,7 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
         pixel = rb_ary_entry(pixels_arg, x);
         if (rb_obj_is_kind_of(pixel, pixel_class) != Qtrue)
         {
+            xfree(pixels.v);
             rb_raise(rb_eTypeError, "element %ld in pixel array is %s, expected %s"
                      , x, rb_class2name(CLASS_OF(pixel)),rb_class2name(CLASS_OF(pixel0)));
         }
@@ -3986,6 +3922,7 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
             pixels.f[x] = (float) NUM2DBL(pixel);
             if (pixels.f[x] < 0.0 || pixels.f[x] > 1.0)
             {
+                xfree(pixels.v);
                 rb_raise(rb_eArgError, "element %ld is out of range [0..1]: %f", x, pixels.f[x]);
             }
         }
@@ -3995,12 +3932,11 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
         }
     }
 
-    exception = AcquireExceptionInfo();
-
     // This is based on ConstituteImage in IM 5.5.7
-    image = AcquireImage(NULL);
+    image = rm_acquire_image((ImageInfo *) NULL);
     if (!image)
     {
+        xfree(pixels.v);
         rb_raise(rb_eNoMemError, "not enough memory to continue.");
     }
 
@@ -4014,11 +3950,6 @@ Image_constitute(VALUE class, VALUE width_arg, VALUE height_arg
     xfree(pixels.v);
     rm_check_image_exception(image, DestroyOnError);
 
-    (void) DestroyExceptionInfo(exception);
-#if defined(HAVE_DESTROYCONSTITUTE) || defined(HAVE_CONSTITUTECOMPONENTTERMINUS)
-    DestroyConstitute();
-#endif
-
     RB_GC_GUARD(pixel);
     RB_GC_GUARD(pixel0);
     RB_GC_GUARD(pixel_class);
@@ -4279,7 +4210,16 @@ Image_convolve(VALUE self, VALUE order_arg, VALUE kernel_arg)
     kernel = (double *)ALLOC_N(double, order*order);
     for (x = 0; x < order*order; x++)
     {
-        kernel[x] = NUM2DBL(rb_ary_entry(kernel_arg, (long)x));
+        VALUE element = rb_ary_entry(kernel_arg, (long)x);
+        if (rm_check_num2dbl(element))
+        {
+            kernel[x] = NUM2DBL(element);
+        }
+        else
+        {
+            xfree((void *)kernel);
+            rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(element)));
+        }
     }
 
     exception = AcquireExceptionInfo();
@@ -4343,7 +4283,16 @@ Image_convolve_channel(int argc, VALUE *argv, VALUE self)
     // Convert the kernel array argument to an array of doubles
     for (x = 0; x < order*order; x++)
     {
-        kernel[x] = NUM2DBL(rb_ary_entry(ary, (long)x));
+        VALUE element = rb_ary_entry(ary, (long)x);
+        if (rm_check_num2dbl(element))
+        {
+            kernel[x] = NUM2DBL(element);
+        }
+        else
+        {
+            xfree((void *)kernel);
+            rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(element)));
+        }
     }
 
     exception = AcquireExceptionInfo();
@@ -4465,10 +4414,11 @@ Image_cycle_colormap(VALUE self, VALUE amount)
     Image *image, *new_image;
     int amt;
 
-    image = rm_check_destroyed(self);
+    amt = NUM2INT(amount);
 
+    image = rm_check_destroyed(self);
     new_image = rm_clone_image(image);
-    amt = NUM2INT(amount);
+
     (void) CycleColormapImage(new_image, amt);
     // No need to check for an error
 
@@ -4586,7 +4536,6 @@ Image_density_eq(VALUE self, VALUE density_arg)
 VALUE
 Image_decipher(VALUE self, VALUE passphrase)
 {
-#if defined(HAVE_ENCIPHERIMAGE)
     Image *image, *new_image;
     char *pf;
     ExceptionInfo *exception;
@@ -4609,12 +4558,6 @@ Image_decipher(VALUE self, VALUE passphrase)
     DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
-#else
-    self = self;
-    passphrase = passphrase;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -4638,7 +4581,6 @@ Image_decipher(VALUE self, VALUE passphrase)
 VALUE
 Image_define(VALUE self, VALUE artifact, VALUE value)
 {
-#if defined(HAVE_SETIMAGEARTIFACT)
     Image *image;
     char *key, *val;
     MagickBooleanType status;
@@ -4663,13 +4605,6 @@ Image_define(VALUE self, VALUE artifact, VALUE value)
     }
 
     return value;
-#else
-    rm_not_implemented();
-    artifact = artifact;
-    value = value;
-    self = self;
-    return(VALUE)0;
-#endif
 }
 
 
@@ -4714,7 +4649,7 @@ VALUE
 Image_delete_profile(VALUE self, VALUE name)
 {
     Image *image = rm_check_frozen(self);
-    (void) ProfileImage(image, StringValuePtr(name), NULL, 0, MagickTrue);
+    (void) DeleteImageProfile(image, StringValuePtr(name));
     rm_check_image_exception(image, RetainOnError);
 
     return self;
@@ -4774,7 +4709,6 @@ Image_depth(VALUE self)
 VALUE
 Image_deskew(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_DESKEWIMAGE)
     Image *image, *new_image;
     double threshold = 40.0 * QuantumRange / 100.0;
     unsigned long width;
@@ -4807,13 +4741,6 @@ Image_deskew(int argc, VALUE *argv, VALUE self)
     (void) DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
-#else
-    self = self;        // defeat "unused parameter" message
-    argv = argv;
-    argc = argc;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -5302,13 +5229,20 @@ Image_distort(int argc, VALUE *argv, VALUE self)
     }
 
     npoints = RARRAY_LEN(pts);
-    // Allocate points array from Ruby's memory. If an error occurs Ruby will
-    // be able to clean it up.
     points = ALLOC_N(double, npoints);
 
     for (n = 0; n < npoints; n++)
     {
-        points[n] = NUM2DBL(rb_ary_entry(pts, n));
+        VALUE element = rb_ary_entry(pts, n);
+        if (rm_check_num2dbl(element))
+        {
+            points[n] = NUM2DBL(element);
+        }
+        else
+        {
+            xfree(points);
+            rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(element)));
+        }
     }
 
     exception = AcquireExceptionInfo();
@@ -5664,7 +5598,6 @@ Image_emboss(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_encipher(VALUE self, VALUE passphrase)
 {
-#if defined(HAVE_ENCIPHERIMAGE)
     Image *image, *new_image;
     char *pf;
     ExceptionInfo *exception;
@@ -5687,12 +5620,6 @@ Image_encipher(VALUE self, VALUE passphrase)
     DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
-#else
-    self = self;
-    passphrase = passphrase;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -5808,7 +5735,6 @@ Image_equalize(VALUE self)
 VALUE
 Image_equalize_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_EQUALIZEIMAGECHANNEL)
     Image *image, *new_image;
     ExceptionInfo *exception;
     ChannelType channels;
@@ -5830,13 +5756,6 @@ Image_equalize_channel(int argc, VALUE *argv, VALUE self)
     (void) DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
-#else
-    argc = argc;
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE) 0;
-#endif
 }
 
 
@@ -6051,7 +5970,7 @@ Image_export_pixels(int argc, VALUE *argv, VALUE self)
         CHECK_EXCEPTION()
 
         // Should never get here...
-        rm_magick_error("ExportImagePixels failed with no explanation.", NULL);
+        rm_magick_error("ExportImagePixels failed with no explanation.");
     }
 
     (void) DestroyExceptionInfo(exception);
@@ -6260,7 +6179,7 @@ Image_export_pixels_to_str(int argc, VALUE *argv, VALUE self)
         CHECK_EXCEPTION()
 
         // Should never get here...
-        rm_magick_error("ExportImagePixels failed with no explanation.", NULL);
+        rm_magick_error("ExportImagePixels failed with no explanation.");
     }
 
     (void) DestroyExceptionInfo(exception);
@@ -6618,9 +6537,9 @@ Image_format_eq(VALUE self, VALUE magick)
 
     image = rm_check_frozen(self);
 
-    exception = AcquireExceptionInfo();
-
     mgk = StringValuePtr(magick);
+
+    exception = AcquireExceptionInfo();
     m = GetMagickInfo(mgk, exception);
     CHECK_EXCEPTION()
 
@@ -6692,7 +6611,7 @@ Image_frame(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 7:
-            Color_to_PixelPacket(&image->matte_color, argv[6]);
+            Color_to_PixelColor(&image->matte_color, argv[6]);
         case 6:
             frame_info.outer_bevel = NUM2LONG(argv[5]);
         case 5:
@@ -6787,7 +6706,6 @@ Image_from_blob(VALUE class, VALUE blob_arg)
 VALUE
 Image_function_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_FUNCTIONIMAGECHANNEL)
     Image *image, *new_image;
     MagickFunction function;
     unsigned long n, nparms;
@@ -6811,23 +6729,15 @@ Image_function_channel(int argc, VALUE *argv, VALUE self)
 
     switch (function)
     {
-#if defined(HAVE_ENUM_POLYNOMIALFUNCTION)
         case PolynomialFunction:
             if (argc == 0)
             {
                 rb_raise(rb_eArgError, "PolynomialFunction requires at least one argument.");
             }
             break;
-#endif
-#if defined(HAVE_ENUM_SINUSOIDFUNCTION)
         case SinusoidFunction:
-#endif
-#if defined(HAVE_ENUM_ARCSINFUNCTION)
         case ArcsinFunction:
-#endif
-#if defined(HAVE_ENUM_ARCTANFUNCTION)
         case ArctanFunction:
-#endif
            if (argc < 1 || argc > 4)
            {
                rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 4)", argc);
@@ -6843,7 +6753,16 @@ Image_function_channel(int argc, VALUE *argv, VALUE self)
 
     for (n = 0; n < nparms; n++)
     {
-        parms[n] = NUM2DBL(argv[n]);
+        VALUE element = argv[n];
+        if (rm_check_num2dbl(element))
+        {
+            parms[n] = NUM2DBL(element);
+        }
+        else
+        {
+            xfree(parms);
+            rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(element)));
+        }
     }
 
     exception = AcquireExceptionInfo();
@@ -6854,13 +6773,6 @@ Image_function_channel(int argc, VALUE *argv, VALUE self)
     DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    argc = argc;
-    argv = argv;
-    self = self;
-#endif
 }
 
 
@@ -6898,6 +6810,56 @@ Image_fuzz_eq(VALUE self, VALUE fuzz)
 }
 
 
+/**
+ * Apply fx on the image.
+ *
+ * Ruby usage:
+ *   - @verbatim Image#fx(expression) @endverbatim
+ *   - @verbatim Image#fx(expression, channel) @endverbatim
+ *   - @verbatim Image#fx(expression, channel, ...) @endverbatim
+ *
+ * Notes:
+ *   - Default channel is AllChannels
+ *
+ * @param argc number of input arguments
+ * @param argv array of input arguments
+ * @param self this object
+ * @return a new image
+ */
+VALUE
+Image_fx(int argc, VALUE *argv, VALUE self)
+{
+    Image *image, *new_image;
+    char *expression;
+    ChannelType channels;
+    ExceptionInfo *exception;
+
+    image = rm_check_destroyed(self);
+    channels = extract_channels(&argc, argv);
+
+    // There must be exactly 1 remaining argument.
+    if (argc == 0)
+    {
+        rb_raise(rb_eArgError, "wrong number of arguments (0 for 1 or more)");
+    }
+    else if (argc > 1)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+
+    expression = StringValuePtr(argv[0]);
+
+    exception = AcquireExceptionInfo();
+    new_image = FxImageChannel(image, channels, expression, exception);
+    rm_check_exception(exception, new_image, DestroyOnError);
+    (void) DestroyExceptionInfo(exception);
+
+    rm_ensure_result(new_image);
+
+    return rm_image_new(new_image);
+}
+
+
 DEF_ATTR_ACCESSOR(Image, gamma, dbl)
 
 
@@ -6922,6 +6884,7 @@ Image_gamma_channel(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
     ChannelType channels;
+    double gamma;
 
     image = rm_check_destroyed(self);
     channels = extract_channels(&argc, argv);
@@ -6936,9 +6899,10 @@ Image_gamma_channel(int argc, VALUE *argv, VALUE self)
         raise_ChannelType_error(argv[argc-1]);
     }
 
+    gamma = NUM2DBL(argv[0]);
     new_image = rm_clone_image(image);
 
-    (void)GammaImageChannel(new_image, channels, NUM2DBL(argv[0]));
+    (void)GammaImageChannel(new_image, channels, gamma);
     rm_check_image_exception(new_image, DestroyOnError);
 
     return rm_image_new(new_image);
@@ -6975,13 +6939,6 @@ Image_gamma_correct(int argc, VALUE *argv, VALUE self)
     {
         case 1:
             red_gamma   = NUM2DBL(argv[0]);
-
-            // Can't have all 4 gamma values == 1.0. Also, very small values
-            // cause ImageMagick to segv.
-            if (red_gamma == 1.0 || fabs(red_gamma) < 0.003)
-            {
-                rb_raise(rb_eArgError, "invalid gamma value (%f)", red_gamma);
-            }
             green_gamma = blue_gamma = red_gamma;
             break;
         case 2:
@@ -7190,11 +7147,7 @@ Image_get_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg, VALUE row
     // Cast AcquireImagePixels to get rid of the const qualifier. We're not going
     // to change the pixels but I don't want to make "pixels" const.
     exception = AcquireExceptionInfo();
-#if defined(HAVE_GETVIRTUALPIXELS)
     pixels = GetVirtualPixels(image, x, y, columns, rows, exception);
-#else
-    pixels = AcquireImagePixels(image, x, y, columns, rows, exception);
-#endif
     CHECK_EXCEPTION()
 
     (void) DestroyExceptionInfo(exception);
@@ -7260,7 +7213,30 @@ has_attribute(VALUE self, MagickBooleanType (attr_test)(const Image *, Exception
 VALUE
 Image_gray_q(VALUE self)
 {
-    return has_attribute(self, (MagickBooleanType (*)(const Image *, ExceptionInfo *))IsGrayImage);
+#if defined(HAVE_SETIMAGEGRAY)
+    return has_attribute(self, (MagickBooleanType (*)(const Image *, ExceptionInfo *))SetImageGray);
+#else
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+    return has_attribute(self, IsGrayImage);
+#else
+    // For ImageMagick 6.7
+    Image *image;
+    ColorspaceType colorspace;
+    VALUE ret;
+
+    image = rm_check_destroyed(self);
+    colorspace = image->colorspace;
+    if (image->colorspace == sRGBColorspace || image->colorspace == TransparentColorspace) {
+        // Workaround
+        //   If image colorspace has non-RGBColorspace, IsGrayImage() always return false.
+        image->colorspace = RGBColorspace;
+    }
+
+    ret = has_attribute(self, IsGrayImage);
+    image->colorspace = colorspace;
+    return ret;
+#endif
+#endif
 }
 
 
@@ -7449,26 +7425,38 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
 
         if (stg_type == DoublePixel || stg_type == FloatPixel)
         {
-            // Get an array for double pixels. Use Ruby's memory so GC will clean up after
-            // us in case of an exception.
             fpixels = ALLOC_N(double, npixels);
             for (n = 0; n < npixels; n++)
             {
-                fpixels[n] = NUM2DBL(rb_ary_entry(pixel_ary, n));
+                VALUE element = rb_ary_entry(pixel_ary, n);
+                if (rm_check_num2dbl(element))
+                {
+                    fpixels[n] = NUM2DBL(element);
+                }
+                else
+                {
+                    xfree(fpixels);
+                    rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(element)));
+                }
             }
             buffer = (void *) fpixels;
             stg_type = DoublePixel;
         }
         else
         {
-            // Get array for Quantum pixels. Use Ruby's memory so GC will clean up after us
-            // in case of an exception.
             pixels = ALLOC_N(Quantum, npixels);
             for (n = 0; n < npixels; n++)
             {
-                VALUE p = rb_ary_entry(pixel_ary, n);
-                pixels[n] = NUM2QUANTUM(p);
-                RB_GC_GUARD(p);
+                VALUE element = rb_ary_entry(pixel_ary, n);
+                if (rm_check_num2dbl(element))
+                {
+                    pixels[n] = NUM2DBL(element);
+                }
+                else
+                {
+                    xfree(pixels);
+                    rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(element)));
+                }
             }
             buffer = (void *) pixels;
             stg_type = QuantumPixel;
@@ -7492,7 +7480,7 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
     {
         rm_check_image_exception(image, RetainOnError);
         // Shouldn't get here...
-        rm_magick_error("ImportImagePixels failed with no explanation.", NULL);
+        rm_magick_error("ImportImagePixels failed with no explanation.");
     }
 
     RB_GC_GUARD(pixel_arg);
@@ -7622,7 +7610,6 @@ build_inspect_string(Image *image, char *buffer, size_t len)
     }
 
 
-#if defined(HAVE_SETIMAGEARTIFACT)
     if (len-1-x > 6)
     {
         size_t value_l;
@@ -7637,7 +7624,6 @@ build_inspect_string(Image *image, char *buffer, size_t len)
             x += value_l;
         }
     }
-#endif
 
     assert(x < (int)(len-1));
     buffer[x] = '\0';
@@ -7757,10 +7743,10 @@ Image_iptc_profile(VALUE self)
 VALUE
 Image_iptc_profile_eq(VALUE self, VALUE profile)
 {
-    (void) Image_delete_profile(self, rb_str_new2("IPTC"));
+    (void) Image_delete_profile(self, rb_str_new2("iptc"));
     if (profile != Qnil)
     {
-        (void) set_profile(self, "IPTC", profile);
+        (void) set_profile(self, "iptc", profile);
     }
     return self;
 }
@@ -7918,9 +7904,8 @@ Image_level_channel(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_level_colors(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_LEVELIMAGECOLORS) || defined(HAVE_LEVELCOLORSIMAGECHANNEL)
     Image *image, *new_image;
-    MagickPixelPacket black_color, white_color;
+    MagickPixel black_color, white_color;
     ChannelType channels;
     ExceptionInfo *exception;
     MagickBooleanType invert = MagickTrue;
@@ -7930,38 +7915,27 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
 
     channels = extract_channels(&argc, argv);
 
+    rm_init_magickpixel(image, &white_color);
+    rm_init_magickpixel(image, &black_color);
+
     switch (argc)
     {
         case 3:
             invert = RTEST(argv[2]);
 
         case 2:
-            Color_to_MagickPixelPacket(image, &white_color, argv[1]);
-            Color_to_MagickPixelPacket(image, &black_color, argv[0]);
+            Color_to_MagickPixel(image, &white_color, argv[1]);
+            Color_to_MagickPixel(image, &black_color, argv[0]);
             break;
 
         case 1:
-            Color_to_MagickPixelPacket(image, &black_color, argv[0]);
-            exception = AcquireExceptionInfo();
-
-            GetMagickPixelPacket(image, &white_color);
-            (void) QueryMagickColor("white", &white_color, exception);
-            CHECK_EXCEPTION()
-
-            DestroyExceptionInfo(exception);
+            rm_set_magickpixel(&white_color, "white");
+            Color_to_MagickPixel(image, &black_color, argv[0]);
+            break;
 
         case 0:
-            exception = AcquireExceptionInfo();
-
-            GetMagickPixelPacket(image, &white_color);
-            (void) QueryMagickColor("white", &white_color, exception);
-            CHECK_EXCEPTION()
-
-            GetMagickPixelPacket(image, &black_color);
-            (void) QueryMagickColor("black", &black_color, exception);
-            CHECK_EXCEPTION()
-
-            DestroyExceptionInfo(exception);
+            rm_set_magickpixel(&white_color, "white");
+            rm_set_magickpixel(&black_color, "black");
             break;
 
         default:
@@ -7971,11 +7945,7 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
 
     new_image = rm_clone_image(image);
 
-#if defined(HAVE_LEVELCOLORSIMAGECHANNEL)      // new in 6.5.6-4
     status = LevelColorsImageChannel(new_image, channels, &black_color, &white_color, invert);
-#else
-    status = LevelImageColors(new_image, channels, &black_color, &white_color, invert);
-#endif
     rm_check_image_exception(new_image, DestroyOnError);
     if (!status)
     {
@@ -7983,14 +7953,6 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
     }
 
     return rm_image_new(new_image);
-
-#else
-    rm_not_implemented();
-    self = self;
-    argc = argc;
-    argv = argv;
-    return(VALUE)0;
-#endif
 }
 
 
@@ -8018,7 +7980,6 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_levelize_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_LEVELIZEIMAGECHANNEL)
     Image *image, *new_image;
     ChannelType channels;
     double black_point, white_point;
@@ -8058,13 +8019,6 @@ Image_levelize_channel(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eRuntimeError, "LevelizeImageChannel failed for unknown reason.");
     }
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    self = self;
-    argc = argc;
-    argv = argv;
-    return(VALUE)0;
-#endif
 }
 
 
@@ -8122,7 +8076,6 @@ Image_linear_stretch(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_liquid_rescale(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_LIQUIDRESCALEIMAGE)
     Image *image, *new_image;
     unsigned long cols, rows;
     double delta_x = 0.0;
@@ -8153,13 +8106,6 @@ Image_liquid_rescale(int argc, VALUE *argv, VALUE self)
     rm_ensure_result(new_image);
 
     return rm_image_new(new_image);
-#else
-    argc = argc;    // defeat "unused parameter" messages
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -8189,8 +8135,6 @@ Image__load(VALUE class, VALUE str)
 
     class = class;  // Suppress "never referenced" message from icc
 
-    info = CloneImageInfo(NULL);
-
     blob = rm_str2cstr(str, &length);
 
     // Must be as least as big as the 1st 4 fields in DumpedImage
@@ -8225,6 +8169,8 @@ Image__load(VALUE class, VALUE str)
         rb_raise(rb_eTypeError, "image is invalid or corrupted (too short)");
     }
 
+    info = CloneImageInfo(NULL);
+
     memcpy(info->magick, ((DumpedImage *)blob)->magick, mi.len);
     info->magick[mi.len] = '\0';
 
@@ -8344,10 +8290,8 @@ Image_map(int argc, VALUE *argv, VALUE self)
     VALUE map_obj, map_arg;
     unsigned int dither = MagickFalse;
 
-#if defined(HAVE_REMAPIMAGE)
     QuantizeInfo quantize_info;
     rb_warning("Image#map is deprecated. Use Image#remap instead");
-#endif
 
     image = rm_check_destroyed(self);
 
@@ -8363,17 +8307,14 @@ Image_map(int argc, VALUE *argv, VALUE self)
             break;
     }
 
-    new_image = rm_clone_image(image);
-
     map_obj = rm_cur_image(map_arg);
     map = rm_check_destroyed(map_obj);
-#if defined(HAVE_REMAPIMAGE)
+
+    new_image = rm_clone_image(image);
+
     GetQuantizeInfo(&quantize_info);
     quantize_info.dither=dither;
     (void) RemapImage(&quantize_info, new_image, map);
-#else
-    (void) MapImage(new_image, map, dither);
-#endif
     rm_check_image_exception(new_image, DestroyOnError);
 
     RB_GC_GUARD(map_obj);
@@ -8411,14 +8352,7 @@ Image_marshal_dump(VALUE self)
     }
 
     ary = rb_ary_new2(2);
-    if (image->filename)
-    {
-        rb_ary_store(ary, 0, rb_str_new2(image->filename));
-    }
-    else
-    {
-        rb_ary_store(ary, 0, Qnil);
-    }
+    rb_ary_store(ary, 0, rb_str_new2(image->filename));
 
     exception = AcquireExceptionInfo();
     blob = ImageToBlob(info, image, &length, exception);
@@ -8518,7 +8452,7 @@ get_image_mask(Image *image)
  * @param self this object
  * @param mask the mask to use
  * @return copy of the current clip-mask or nil
- * @deprecated Please use Image_mask(mask-image).
+ * @deprecated This method has been deprecated. Please use Image_mask(mask-image).
  * @see Image_mask(mask-image)
  * @see get_image_mask
  */
@@ -8527,6 +8461,7 @@ Image_mask_eq(VALUE self, VALUE mask)
 {
     VALUE v[1];
     v[0] = mask;
+    rb_warning("Image#mask= is deprecated; use Image#mask.");
     return Image_mask(1, v, self);
 }
 
@@ -8594,18 +8529,13 @@ Image_mask(int argc, VALUE *argv, VALUE self)
         }
 
         // The following section is copied from mogrify.c (6.2.8-8)
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         exception = AcquireExceptionInfo();
-#endif
+
         for (y = 0; y < (long) clip_mask->rows; y++)
         {
-#if defined(HAVE_GETAUTHENTICPIXELS)
             q = GetAuthenticPixels(clip_mask, 0, y, clip_mask->columns, 1, exception);
             rm_check_exception(exception, clip_mask, DestroyOnError);
-#else
-            q = GetImagePixels(clip_mask, 0, y, clip_mask->columns, 1);
-            rm_check_image_exception(clip_mask, DestroyOnError);
-#endif
+
             if (!q)
             {
                 break;
@@ -8622,17 +8552,10 @@ Image_mask(int argc, VALUE *argv, VALUE self)
                 q += 1;
             }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
             SyncAuthenticPixels(clip_mask, exception);
             rm_check_exception(exception, clip_mask, DestroyOnError);
-#else
-            SyncImagePixels(clip_mask);
-            rm_check_image_exception(clip_mask, DestroyOnError);
-#endif
         }
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         (void) DestroyExceptionInfo(exception);
-#endif
 
         SetImageStorageClass(clip_mask, DirectClass);
         rm_check_image_exception(clip_mask, DestroyOnError);
@@ -8665,7 +8588,7 @@ Image_mask(int argc, VALUE *argv, VALUE self)
  *
  * @param self this object
  * @return the matte
- * @deprecated Deprecated as of ImageMagick 6.3.6. See Image_alpha
+ * @deprecated This method has been deprecated. Please use Image_alpha.
  * @see Image_alpha
  * @see Image_alpha_eq
  */
@@ -8675,6 +8598,7 @@ Image_matte(VALUE self)
     Image *image;
 
     image = rm_check_destroyed(self);
+    rb_warning("Image#matte is deprecated; use Image#alpha.");
     return image->matte ? Qtrue : Qfalse;
 }
 
@@ -8688,14 +8612,13 @@ Image_matte(VALUE self)
  * @param self this object
  * @param matte the matte
  * @return the matte
- * @deprecated Deprecated as of ImageMagick 6.3.6. See Image_alpha_eq
+ * @deprecated This method has been deprecated. Please use Image_alpha.
  * @see Image_alpha_eq
  * @see Image_alpha
  */
 VALUE
 Image_matte_eq(VALUE self, VALUE matte)
 {
-#if defined(HAVE_SETIMAGEALPHACHANNEL)
     VALUE alpha_channel_type;
 
     if (RTEST(matte))
@@ -8707,12 +8630,9 @@ Image_matte_eq(VALUE self, VALUE matte)
         alpha_channel_type = rb_const_get(Module_Magick, rb_intern("DeactivateAlphaChannel"));
     }
 
+    rb_warning("Image#matte= is deprecated; use Image#alpha.");
+
     return Image_alpha_eq(self, alpha_channel_type);
-#else
-    Image *image = rm_check_frozen(self);
-    image->matte = RTEST(matte) ? MagickTrue : MagickFalse;
-    return matte;
-#endif
 }
 
 
@@ -8729,7 +8649,7 @@ VALUE
 Image_matte_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return rm_pixelpacket_to_color_name(image, &image->matte_color);
+    return rm_pixelcolor_to_color_name(image, &image->matte_color);
 }
 
 /**
@@ -8746,7 +8666,7 @@ VALUE
 Image_matte_color_eq(VALUE self, VALUE color)
 {
     Image *image = rm_check_frozen(self);
-    Color_to_PixelPacket(&image->matte_color, color);
+    Color_to_PixelColor(&image->matte_color, color);
     return self;
 }
 
@@ -8769,13 +8689,16 @@ VALUE
 Image_matte_flood_fill(VALUE self, VALUE color, VALUE opacity, VALUE x_obj, VALUE y_obj, VALUE method_obj)
 {
     Image *image, *new_image;
-    PixelPacket target;
+    PixelColor target;
     Quantum op;
     long x, y;
     PaintMethod method;
+    DrawInfo *draw_info;
+    MagickPixel target_mpp;
+    MagickBooleanType invert;
 
     image = rm_check_destroyed(self);
-    Color_to_PixelPacket(&target, color);
+    Color_to_PixelColor(&target, color);
 
     op = APP2QUANTUM(opacity);
 
@@ -8796,40 +8719,32 @@ Image_matte_flood_fill(VALUE self, VALUE color, VALUE opacity, VALUE x_obj, VALU
 
     new_image = rm_clone_image(image);
 
-#if defined(HAVE_FLOODFILLPAINTIMAGE)
+    // FloodfillPaintImage looks for the opacity in the DrawInfo.fill field.
+    draw_info = CloneDrawInfo(NULL, NULL);
+    if (!draw_info)
     {
-        DrawInfo *draw_info;
-        MagickPixelPacket target_mpp;
-        MagickBooleanType invert;
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
+    draw_info->fill.opacity = op;
 
-        // FloodfillPaintImage looks for the opacity in the DrawInfo.fill field.
-        draw_info = CloneDrawInfo(NULL, NULL);
-        if (!draw_info)
-        {
-            rb_raise(rb_eNoMemError, "not enough memory to continue");
-        }
-        draw_info->fill.opacity = op;
+    if (method == FillToBorderMethod)
+    {
+        invert = MagickTrue;
+        target_mpp.red   = (MagickRealType) image->border_color.red;
+        target_mpp.green = (MagickRealType) image->border_color.green;
+        target_mpp.blue  = (MagickRealType) image->border_color.blue;
+    }
+    else
+    {
+        invert = MagickFalse;
+        target_mpp.red   = (MagickRealType) target.red;
+        target_mpp.green = (MagickRealType) target.green;
+        target_mpp.blue  = (MagickRealType) target.blue;
+    }
 
-        if (method == FillToBorderMethod)
-        {
-            invert = MagickTrue;
-            target_mpp.red   = (MagickRealType) image->border_color.red;
-            target_mpp.green = (MagickRealType) image->border_color.green;
-            target_mpp.blue  = (MagickRealType) image->border_color.blue;
-        }
-        else
-        {
-            invert = MagickFalse;
-            target_mpp.red   = (MagickRealType) target.red;
-            target_mpp.green = (MagickRealType) target.green;
-            target_mpp.blue  = (MagickRealType) target.blue;
-        }
+    (void) FloodfillPaintImage(new_image, OpacityChannel, draw_info, &target_mpp, x, y, invert);
+    (void) DestroyDrawInfo(draw_info);
 
-        (void) FloodfillPaintImage(new_image, OpacityChannel, draw_info, &target_mpp, x, y, invert);
-    }
-#else
-    (void) MatteFloodfillImage(new_image, target, op, x, y, method);
-#endif
     rm_check_image_exception(new_image, DestroyOnError);
 
     return rm_image_new(new_image);
@@ -8873,11 +8788,7 @@ Image_median_filter(int argc, VALUE *argv, VALUE self)
     }
 
     exception = AcquireExceptionInfo();
-#if defined(HAVE_STATISTICIMAGE)
     new_image = StatisticImage(image, MedianStatistic, (size_t)radius, (size_t)radius, exception);
-#else
-    new_image = MedianFilterImage(image, radius, exception);
-#endif
     rm_check_exception(exception, new_image, DestroyOnError);
 
     (void) DestroyExceptionInfo(exception);
@@ -9061,10 +8972,6 @@ Image_monitor_eq(VALUE self, VALUE monitor)
         (void) SetImageProgressMonitor(image, rm_progress_monitor, (void *)monitor);
     }
 
-#if defined(_WIN32)
-    rb_warn("Image#monitor= does not work on Windows");
-#endif
-
     return self;
 }
 
@@ -9082,7 +8989,7 @@ Image_monitor_eq(VALUE self, VALUE monitor)
 VALUE
 Image_monochrome_q(VALUE self)
 {
-    return has_attribute(self, (MagickBooleanType (*)(const Image *, ExceptionInfo *))IsMonochromeImage);
+    return has_attribute(self, IsMonochromeImage);
 }
 
 
@@ -9345,7 +9252,7 @@ Image_initialize(int argc, VALUE *argv, VALUE self)
     info_obj = rm_info_new();
     Data_Get_Struct(info_obj, Info, info);
 
-    image = AcquireImage(info);
+    image = rm_acquire_image(info);
     if (!image)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
@@ -9589,22 +9496,19 @@ VALUE
 Image_opaque(VALUE self, VALUE target, VALUE fill)
 {
     Image *image, *new_image;
-    MagickPixelPacket target_pp;
-    MagickPixelPacket fill_pp;
+    MagickPixel target_pp;
+    MagickPixel fill_pp;
     MagickBooleanType okay;
 
     image = rm_check_destroyed(self);
-    new_image = rm_clone_image(image);
 
     // Allow color name or Pixel
-    Color_to_MagickPixelPacket(image, &target_pp, target);
-    Color_to_MagickPixelPacket(image, &fill_pp, fill);
+    Color_to_MagickPixel(image, &target_pp, target);
+    Color_to_MagickPixel(image, &fill_pp, fill);
+
+    new_image = rm_clone_image(image);
 
-#if defined(HAVE_OPAQUEPAINTIMAGECHANNEL)
     okay = OpaquePaintImageChannel(new_image, DefaultChannels, &target_pp, &fill_pp, MagickFalse);
-#else
-    okay =  PaintOpaqueImageChannel(new_image, DefaultChannels, &target_pp, &fill_pp);
-#endif
     rm_check_image_exception(new_image, DestroyOnError);
 
     if (!okay)
@@ -9642,9 +9546,8 @@ Image_opaque(VALUE self, VALUE target, VALUE fill)
 VALUE
 Image_opaque_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_OPAQUEPAINTIMAGECHANNEL)
     Image *image, *new_image;
-    MagickPixelPacket target_pp, fill_pp;
+    MagickPixel target_pp, fill_pp;
     ChannelType channels;
     double keep, fuzz;
     MagickBooleanType okay, invert = MagickFalse;
@@ -9671,8 +9574,8 @@ Image_opaque_channel(int argc, VALUE *argv, VALUE self)
             invert = RTEST(argv[2]);
         case 2:
             // Allow color name or Pixel
-            Color_to_MagickPixelPacket(image, &fill_pp, argv[1]);
-            Color_to_MagickPixelPacket(image, &target_pp, argv[0]);
+            Color_to_MagickPixel(image, &fill_pp, argv[1]);
+            Color_to_MagickPixel(image, &target_pp, argv[0]);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (got %d, expected 2 or more)", argc);
@@ -9697,14 +9600,6 @@ Image_opaque_channel(int argc, VALUE *argv, VALUE self)
     }
 
     return rm_image_new(new_image);
-
-#else
-    argc = argc;    // defeat "unused parameter" messages
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -9892,9 +9787,8 @@ Image_page_eq(VALUE self, VALUE rect)
 VALUE
 Image_paint_transparent(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_TRANSPARENTPAINTIMAGE)
     Image *image, *new_image;
-    MagickPixelPacket color;
+    MagickPixel color;
     Quantum opacity = TransparentOpacity;
     double keep, fuzz;
     MagickBooleanType okay, invert = MagickFalse;
@@ -9913,7 +9807,7 @@ Image_paint_transparent(int argc, VALUE *argv, VALUE self)
         case 2:
             opacity = APP2QUANTUM(argv[1]);
         case 1:
-            Color_to_MagickPixelPacket(image, &color, argv[0]);
+            Color_to_MagickPixel(image, &color, argv[0]);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 4)", argc);
@@ -9926,7 +9820,7 @@ Image_paint_transparent(int argc, VALUE *argv, VALUE self)
     keep = new_image->fuzz;
     new_image->fuzz = fuzz;
 
-    okay = TransparentPaintImage(new_image, (const MagickPixelPacket *)&color, opacity, invert);
+    okay = TransparentPaintImage(new_image, (const MagickPixel *)&color, opacity, invert);
     new_image->fuzz = keep;
 
     // Is it possible for TransparentPaintImage to silently fail?
@@ -9939,13 +9833,6 @@ Image_paint_transparent(int argc, VALUE *argv, VALUE self)
     }
 
     return rm_image_new(new_image);
-#else
-    argc = argc;    // defeat "unused parameter" messages
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -10006,7 +9893,8 @@ VALUE
 Image_pixel_color(int argc, VALUE *argv, VALUE self)
 {
     Image *image;
-    PixelPacket old_color, new_color, *pixel;
+    PixelColor new_color;
+    PixelPacket old_color, *pixel;
     ExceptionInfo *exception;
     long x, y;
     unsigned int set = False;
@@ -10023,7 +9911,7 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
             set = True;
             // Replace with new color? The arg can be either a color name or
             // a Magick::Pixel.
-            Color_to_PixelPacket(&new_color, argv[2]);
+            Color_to_PixelColor(&new_color, argv[2]);
         case 2:
             break;
         default:
@@ -10038,11 +9926,7 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
     if (!set)
     {
         exception = AcquireExceptionInfo();
-#if defined(HAVE_GETVIRTUALPIXELS)
         old_color = *GetVirtualPixels(image, x, y, 1, 1, exception);
-#else
-        old_color = *AcquireImagePixels(image, x, y, 1, 1, exception);
-#endif
         CHECK_EXCEPTION()
 
         (void) DestroyExceptionInfo(exception);
@@ -10050,11 +9934,7 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
         // PseudoClass
         if (image->storage_class == PseudoClass)
         {
-#if defined(HAVE_GETAUTHENTICINDEXQUEUE)
             IndexPacket *indexes = GetAuthenticIndexQueue(image);
-#else
-            IndexPacket *indexes = GetIndexes(image);
-#endif
             old_color = image->colormap[(unsigned long)*indexes];
         }
         if (!image->matte)
@@ -10068,7 +9948,7 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
     // Do what IM does and return the background color.
     if (x < 0 || y < 0 || (unsigned long)x >= image->columns || (unsigned long)y >= image->rows)
     {
-        return Pixel_from_PixelPacket(&image->background_color);
+        return Pixel_from_PixelColor(&image->background_color);
     }
 
     // Set the color of a pixel. Return previous color.
@@ -10084,17 +9964,10 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
     }
 
 
-#if defined(HAVE_GETAUTHENTICPIXELS) || defined(HAVE_SYNCAUTHENTICPIXELS)
     exception = AcquireExceptionInfo();
-#endif
 
-#if defined(HAVE_GETAUTHENTICPIXELS)
     pixel = GetAuthenticPixels(image, x, y, 1, 1, exception);
     CHECK_EXCEPTION()
-#else
-    pixel = GetImagePixels(image, x, y, 1, 1);
-    rm_check_image_exception(image, RetainOnError);
-#endif
 
     if (pixel)
     {
@@ -10106,17 +9979,10 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
     }
     *pixel = new_color;
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
     SyncAuthenticPixels(image, exception);
     CHECK_EXCEPTION()
-#else
-    SyncImagePixels(image);
-    rm_check_image_exception(image, RetainOnError);
-#endif
 
-#if defined(HAVE_GETAUTHENTICPIXELS) || defined(HAVE_SYNCAUTHENTICPIXELS)
     (void) DestroyExceptionInfo(exception);
-#endif
 
     return Pixel_from_PixelPacket(&old_color);
 }
@@ -10286,10 +10152,10 @@ Image_preview(VALUE self, VALUE preview)
     PreviewType preview_type;
     ExceptionInfo *exception;
 
-    exception = AcquireExceptionInfo();
     image = rm_check_destroyed(self);
     VALUE_TO_ENUM(preview, preview_type, PreviewType);
 
+    exception = AcquireExceptionInfo();
     new_image = PreviewImage(image, preview_type, exception);
     rm_check_exception(exception, new_image, DestroyOnError);
 
@@ -10463,75 +10329,67 @@ Image_quantum_operator(int argc, VALUE *argv, VALUE self)
         case XorQuantumOperator:
             qop = XorEvaluateOperator;
             break;
-#if defined(HAVE_ENUM_POWEVALUATEOPERATOR)
         case PowQuantumOperator:
             qop = PowEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_LOGEVALUATEOPERATOR)
         case LogQuantumOperator:
             qop = LogEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_THRESHOLDEVALUATEOPERATOR)
         case ThresholdQuantumOperator:
             qop = ThresholdEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_THRESHOLDBLACKEVALUATEOPERATOR)
         case ThresholdBlackQuantumOperator:
             qop = ThresholdBlackEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_THRESHOLDWHITEEVALUATEOPERATOR)
         case ThresholdWhiteQuantumOperator:
             qop = ThresholdWhiteEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_GAUSSIANNOISEEVALUATEOPERATOR)
         case GaussianNoiseQuantumOperator:
             qop = GaussianNoiseEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_IMPULSENOISEEVALUATEOPERATOR)
         case ImpulseNoiseQuantumOperator:
             qop = ImpulseNoiseEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_LAPLACIANNOISEEVALUATEOPERATOR)
         case LaplacianNoiseQuantumOperator:
             qop = LaplacianNoiseEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_MULTIPLICATIVENOISEEVALUATEOPERATOR)
         case MultiplicativeNoiseQuantumOperator:
             qop = MultiplicativeNoiseEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_POISSONNOISEEVALUATEOPERATOR)
         case PoissonNoiseQuantumOperator:
             qop = PoissonNoiseEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_UNIFORMNOISEEVALUATEOPERATOR)
         case UniformNoiseQuantumOperator:
             qop = UniformNoiseEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_COSINEEVALUATEOPERATOR)
         case CosineQuantumOperator:
             qop = CosineEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_SINEEVALUATEOPERATOR)
         case SineQuantumOperator:
             qop = SineEvaluateOperator;
             break;
-#endif
-#if defined(HAVE_ENUM_ADDMODULUSEVALUATEOPERATOR)
         case AddModulusQuantumOperator:
             qop = AddModulusEvaluateOperator;
             break;
+        case MeanQuantumOperator:
+            qop = MeanEvaluateOperator;
+            break;
+        case AbsQuantumOperator:
+            qop = AbsEvaluateOperator;
+            break;
+        case ExponentialQuantumOperator:
+            qop = ExponentialEvaluateOperator;
+            break;
+        case MedianQuantumOperator:
+            qop = MedianEvaluateOperator;
+            break;
+        case SumQuantumOperator:
+            qop = SumEvaluateOperator;
+            break;
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        case RootMeanSquareQuantumOperator:
+            qop = RootMeanSquareEvaluateOperator;
+            break;
 #endif
     }
 
@@ -10584,15 +10442,15 @@ Image_quantize(int argc, VALUE *argv, VALUE self)
         case 4:
             quantize_info.tree_depth = NUM2UINT(argv[3]);
         case 3:
-#if defined(HAVE_TYPE_DITHERMETHOD) && defined(HAVE_ENUM_NODITHERMETHOD)
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
                 quantize_info.dither = quantize_info.dither_method != NoDitherMethod;
             }
-#else
-            quantize_info.dither = (MagickBooleanType) RTEST(argv[2]);
-#endif
+            else
+            {
+                quantize_info.dither = (MagickBooleanType) RTEST(argv[2]);
+            }
         case 2:
             VALUE_TO_ENUM(argv[1], quantize_info.colorspace, ColorspaceType);
         case 1:
@@ -10624,18 +10482,19 @@ Image_quantize(int argc, VALUE *argv, VALUE self)
  * @return a new image
  */
 VALUE
-Image_radial_blur(VALUE self, VALUE angle)
+Image_radial_blur(VALUE self, VALUE angle_obj)
 {
     Image *image, *new_image;
     ExceptionInfo *exception;
+    double angle = NUM2DBL(angle_obj);
 
     image = rm_check_destroyed(self);
     exception = AcquireExceptionInfo();
 
-#if defined(HAVE_ROTATIONALBLURIMAGE)
-    new_image = RotationalBlurImage(image, NUM2DBL(angle), exception);
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+    new_image = RotationalBlurImage(image, angle, exception);
 #else
-    new_image = RadialBlurImage(image, NUM2DBL(angle), exception);
+    new_image = RadialBlurImage(image, angle, exception);
 #endif
     rm_check_exception(exception, new_image, DestroyOnError);
 
@@ -10670,6 +10529,7 @@ Image_radial_blur_channel(int argc, VALUE *argv, VALUE self)
     Image *image, *new_image;
     ExceptionInfo *exception;
     ChannelType channels;
+    double angle;
 
     image = rm_check_destroyed(self);
     channels = extract_channels(&argc, argv);
@@ -10684,12 +10544,13 @@ Image_radial_blur_channel(int argc, VALUE *argv, VALUE self)
         raise_ChannelType_error(argv[argc-1]);
     }
 
+    angle = NUM2DBL(argv[0]);
     exception = AcquireExceptionInfo();
 
-#if defined(HAVE_ROTATIONALBLURIMAGECHANNEL)
-    new_image = RotationalBlurImageChannel(image, channels, NUM2DBL(argv[0]), exception);
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+    new_image = RotationalBlurImageChannel(image, channels, angle, exception);
 #else
-    new_image = RadialBlurImageChannel(image, channels, NUM2DBL(argv[0]), exception);
+    new_image = RadialBlurImageChannel(image, channels, angle, exception);
 #endif
     rm_check_exception(exception, new_image, DestroyOnError);
     (void) DestroyExceptionInfo(exception);
@@ -10885,12 +10746,12 @@ rd_image(VALUE class, VALUE file, reader_t reader)
 
     if (TYPE(file) == T_FILE)
     {
-        OpenFile *fptr;
+        rb_io_t *fptr;
 
         // Ensure file is open - raise error if not
         GetOpenFile(file, fptr);
         rb_io_check_readable(fptr);
-        SetImageInfoFile(info, GetReadFile(fptr));
+        SetImageInfoFile(info, rb_io_stdio_file(fptr));
     }
     else
     {
@@ -10940,13 +10801,10 @@ Image_recolor(VALUE self, VALUE color_matrix)
     long x, len;
     double *matrix;
     ExceptionInfo *exception;
-
-#if defined(HAVE_COLORMATRIXIMAGE)
     KernelInfo *kernel_info;
-#endif
 
     image = rm_check_destroyed(self);
-    exception = AcquireExceptionInfo();
+    color_matrix = rm_check_ary_type(color_matrix);
 
     // Allocate color matrix from Ruby's memory
     len = RARRAY_LEN(color_matrix);
@@ -10954,25 +10812,35 @@ Image_recolor(VALUE self, VALUE color_matrix)
 
     for (x = 0; x < len; x++)
     {
-        matrix[x] = NUM2DBL(rb_ary_entry(color_matrix, x));
+        VALUE element = rb_ary_entry(color_matrix, x);
+        if (rm_check_num2dbl(element))
+        {
+            matrix[x] = NUM2DBL(element);
+        }
+        else
+        {
+            xfree(matrix);
+            rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(element)));
+        }
     }
 
     order = (unsigned long)sqrt((double)(len + 1.0));
 
     // RecolorImage sets the ExceptionInfo and returns a NULL image if an error occurs.
-#if defined(HAVE_COLORMATRIXIMAGE)
-    kernel_info = AcquireKernelInfo("1");
+    kernel_info = AcquireKernelInfo(NULL);
     if (kernel_info == (KernelInfo *) NULL)
-      return((Image *) NULL);
+    {
+        xfree((void *)matrix);
+        return Qnil;
+    }
     kernel_info->width = order;
     kernel_info->height = order;
     kernel_info->values = (double *) matrix;
+
+    exception = AcquireExceptionInfo();
     new_image = ColorMatrixImage(image, kernel_info, exception);
     kernel_info->values = (double *) NULL;
     kernel_info = DestroyKernelInfo(kernel_info);
-#else
-    new_image = RecolorImage(image, order, matrix, exception);
-#endif
     xfree((void *)matrix);
 
     rm_check_exception(exception, new_image, DestroyOnError);
@@ -11106,11 +10974,7 @@ Image_reduce_noise(VALUE self, VALUE radius)
     image = rm_check_destroyed(self);
 
     exception = AcquireExceptionInfo();
-#if defined(HAVE_STATISTICIMAGE)
     new_image = StatisticImage(image, NonpeakStatistic, (size_t)radius, (size_t)radius, exception);
-#else
-    new_image = ReduceNoiseImage(image, NUM2DBL(radius), exception);
-#endif
     rm_check_exception(exception, new_image, DestroyOnError);
 
     (void) DestroyExceptionInfo(exception);
@@ -11137,7 +11001,6 @@ Image_reduce_noise(VALUE self, VALUE radius)
 VALUE
 Image_remap(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_REMAPIMAGE) || defined(HAVE_AFFINITYIMAGE)
     Image *image, *remap_image;
     QuantizeInfo quantize_info;
 
@@ -11164,21 +11027,10 @@ Image_remap(int argc, VALUE *argv, VALUE self)
             break;
     }
 
-#if defined(HAVE_REMAPIMAGE)
     (void) RemapImage(&quantize_info, image, remap_image);
-#else
-    (void) AffinityImage(&quantize_info, image, remap_image);
-#endif
     rm_check_image_exception(image, RetainOnError);
 
     return self;
-#else
-    self = self;
-    argc = argc;
-    argv = argv;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -11522,11 +11374,13 @@ Image_roll(VALUE self, VALUE x_offset, VALUE y_offset)
 {
     Image *image, *new_image;
     ExceptionInfo *exception;
+    ssize_t x = NUM2LONG(x_offset);
+    ssize_t y = NUM2LONG(y_offset);
 
     image = rm_check_destroyed(self);
 
     exception = AcquireExceptionInfo();
-    new_image = RollImage(image, NUM2LONG(x_offset), NUM2LONG(y_offset), exception);
+    new_image = RollImage(image, x, y, exception);
     rm_check_exception(exception, new_image, DestroyOnError);
 
     (void) DestroyExceptionInfo(exception);
@@ -11870,7 +11724,6 @@ DEF_ATTR_READER(Image, scene, ulong)
 VALUE
 Image_selective_blur_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_SELECTIVEBLURIMAGECHANNEL)
     Image *image, *new_image;
     double radius, sigma, threshold;
     ExceptionInfo *exception;
@@ -11900,14 +11753,6 @@ Image_selective_blur_channel(int argc, VALUE *argv, VALUE self)
     rm_ensure_result(new_image);
 
     return rm_image_new(new_image);
-
-#else
-    rm_not_implemented();
-    argc = argc;
-    argv = argv;
-    self = self;
-    return (VALUE)0;
-#endif
 }
 
 
@@ -12380,10 +12225,8 @@ Image_sharpen_channel(int argc, VALUE *argv, VALUE self)
             raise_ChannelType_error(argv[argc-1]);
     }
 
-    new_image = rm_clone_image(image);
-
     exception = AcquireExceptionInfo();
-    (void) SharpenImageChannel(new_image, channels, radius, sigma, exception);
+    new_image = SharpenImageChannel(image, channels, radius, sigma, exception);
 
     rm_check_exception(exception, new_image, DestroyOnError);
     (void) DestroyExceptionInfo(exception);
@@ -12452,11 +12295,13 @@ Image_shear(VALUE self, VALUE x_shear, VALUE y_shear)
 {
     Image *image, *new_image;
     ExceptionInfo *exception;
+    double x = NUM2DBL(x_shear);
+    double y = NUM2DBL(y_shear);
 
     image = rm_check_destroyed(self);
 
     exception = AcquireExceptionInfo();
-    new_image = ShearImage(image, NUM2DBL(x_shear), NUM2DBL(y_shear), exception);
+    new_image = ShearImage(image, x, y, exception);
     rm_check_exception(exception, new_image, DestroyOnError);
 
     (void) DestroyExceptionInfo(exception);
@@ -12673,7 +12518,6 @@ Image_spaceship(VALUE self, VALUE other)
 }
 
 
-#if defined(HAVE_SPARSECOLORIMAGE)
 /**
  * Count the number of channels from the specified list are in an image. Note
  * that this method also removes invalid channels based on the image.
@@ -12721,7 +12565,6 @@ count_channels(Image *image, ChannelType *channels)
 
     return ncolors;
 }
-#endif
 
 
 /**
@@ -12750,14 +12593,13 @@ count_channels(Image *image, ChannelType *channels)
 VALUE
 Image_sparse_color(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_SPARSECOLORIMAGE)
     Image *image, *new_image;
     unsigned long x, nargs, ncolors;
     SparseColorMethod method;
     int n, exp;
     double * volatile args;
     ChannelType channels;
-    MagickPixelPacket pp;
+    MagickPixel pp;
     ExceptionInfo *exception;
 
     image = rm_check_destroyed(self);
@@ -12794,9 +12636,19 @@ Image_sparse_color(int argc, VALUE *argv, VALUE self)
     n = 0;
     while (n < argc)
     {
-        args[x++] = NUM2DBL(argv[n++]);
-        args[x++] = NUM2DBL(argv[n++]);
-        Color_to_MagickPixelPacket(NULL, &pp, argv[n++]);
+        VALUE elem1 = argv[n++];
+        VALUE elem2 = argv[n++];
+        if (rm_check_num2dbl(elem1) && rm_check_num2dbl(elem2))
+        {
+            args[x++] = NUM2DBL(elem1);
+            args[x++] = NUM2DBL(elem2);
+        }
+        else
+        {
+            xfree((void *)args);
+            rb_raise(rb_eTypeError, "type mismatch: %s and %s given", rb_class2name(CLASS_OF(elem1)), rb_class2name(CLASS_OF(elem2)));
+        }
+        Color_to_MagickPixel(NULL, &pp, argv[n++]);
         if (channels & RedChannel)
         {
             args[x++] = pp.red / QuantumRange;
@@ -12826,17 +12678,7 @@ Image_sparse_color(int argc, VALUE *argv, VALUE self)
     (void) DestroyExceptionInfo(exception);
     rm_ensure_result(new_image);
 
-    RB_GC_GUARD(args);
-
     return rm_image_new(new_image);
-
-#else
-    self = self;
-    argc = argc;
-    argv = argv;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -12863,7 +12705,7 @@ VALUE
 Image_splice(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
-    PixelPacket color, old_color;
+    PixelColor color, old_color;
     RectangleInfo rectangle;
     ExceptionInfo *exception;
 
@@ -12876,8 +12718,8 @@ Image_splice(int argc, VALUE *argv, VALUE self)
             color = image->background_color;
             break;
         case 5:
-            // Convert color argument to PixelPacket
-            Color_to_PixelPacket(&color, argv[4]);
+            // Convert color argument to PixelColor
+            Color_to_PixelColor(&color, argv[4]);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 4 or 5)", argc);
@@ -13127,9 +12969,7 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg
     long x, y;
     unsigned long cols, rows;
     unsigned int okay;
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_GETAUTHENTICPIXELS)
     ExceptionInfo *exception;
-#endif
 
     image = rm_check_destroyed(self);
 
@@ -13156,16 +12996,11 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg
     // Get a pointer to the pixels. Replace the values with the PixelPackets
     // from the pixels argument.
     {
-#if defined(HAVE_GETAUTHENTICPIXELS)
         exception = AcquireExceptionInfo();
 
         pixels = GetAuthenticPixels(image, x, y, cols, rows, exception);
         CHECK_EXCEPTION()
         DestroyExceptionInfo(exception);
-#else
-        pixels = GetImagePixels(image, x, y, cols, rows);
-        rm_check_image_exception(image, RetainOnError);
-#endif
 
         if (pixels)
         {
@@ -13175,16 +13010,11 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg
                 Data_Get_Struct(new_pixel, Pixel, pixel);
                 pixels[n] = *pixel;
             }
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
             exception = AcquireExceptionInfo();
 
             SyncAuthenticPixels(image, exception);
             CHECK_EXCEPTION()
             DestroyExceptionInfo(exception);
-#else
-            SyncImagePixels(image);
-            rm_check_image_exception(image, RetainOnError);
-#endif
         }
     }
 
@@ -13226,15 +13056,16 @@ Image_strip_bang(VALUE self)
  * @return a new image
  */
 VALUE
-Image_swirl(VALUE self, VALUE degrees)
+Image_swirl(VALUE self, VALUE degrees_obj)
 {
     Image *image, *new_image;
     ExceptionInfo *exception;
+    double degrees = NUM2DBL(degrees_obj);
 
     image = rm_check_destroyed(self);
 
     exception = AcquireExceptionInfo();
-    new_image = SwirlImage(image, NUM2DBL(degrees), exception);
+    new_image = SwirlImage(image, degrees, exception);
     rm_check_exception(exception, new_image, DestroyOnError);
 
     (void) DestroyExceptionInfo(exception);
@@ -13294,15 +13125,17 @@ Image_texture_flood_fill(VALUE self, VALUE color_obj, VALUE texture_obj
 {
     Image *image, *new_image;
     Image *texture_image;
-    PixelPacket color;
+    PixelColor color;
     VALUE texture;
     DrawInfo *draw_info;
     long x, y;
     PaintMethod method;
+    MagickPixel color_mpp;
+    MagickBooleanType invert;
 
     image = rm_check_destroyed(self);
 
-    Color_to_PixelPacket(&color, color_obj);
+    Color_to_PixelColor(&color, color_obj);
     texture = rm_cur_image(texture_obj);
     texture_image = rm_check_destroyed(texture);
 
@@ -13332,33 +13165,23 @@ Image_texture_flood_fill(VALUE self, VALUE color_obj, VALUE texture_obj
     new_image = rm_clone_image(image);
 
 
-#if defined(HAVE_FLOODFILLPAINTIMAGE)
+    rm_init_magickpixel(new_image, &color_mpp);
+    if (method == FillToBorderMethod)
     {
-        MagickPixelPacket color_mpp;
-        MagickBooleanType invert;
-
-        GetMagickPixelPacket(new_image, &color_mpp);
-        if (method == FillToBorderMethod)
-        {
-            invert = MagickTrue;
-            color_mpp.red   = (MagickRealType) image->border_color.red;
-            color_mpp.green = (MagickRealType) image->border_color.green;
-            color_mpp.blue  = (MagickRealType) image->border_color.blue;
-        }
-        else
-        {
-            invert = MagickFalse;
-            color_mpp.red   = (MagickRealType) color.red;
-            color_mpp.green = (MagickRealType) color.green;
-            color_mpp.blue  = (MagickRealType) color.blue;
-        }
-
-        (void) FloodfillPaintImage(new_image, DefaultChannels, draw_info, &color_mpp, x, y, invert);
+        invert = MagickTrue;
+        color_mpp.red   = (MagickRealType) image->border_color.red;
+        color_mpp.green = (MagickRealType) image->border_color.green;
+        color_mpp.blue  = (MagickRealType) image->border_color.blue;
+    }
+    else
+    {
+        invert = MagickFalse;
+        color_mpp.red   = (MagickRealType) color.red;
+        color_mpp.green = (MagickRealType) color.green;
+        color_mpp.blue  = (MagickRealType) color.blue;
     }
 
-#else
-    (void) ColorFloodfillImage(new_image, draw_info, color, x, y, method);
-#endif
+    (void) FloodfillPaintImage(new_image, DefaultChannels, draw_info, &color_mpp, x, y, invert);
 
     (void) DestroyDrawInfo(draw_info);
     rm_check_image_exception(new_image, DestroyOnError);
@@ -13381,14 +13204,15 @@ Image_texture_flood_fill(VALUE self, VALUE color_obj, VALUE texture_obj
  * @return a new image
  */
 VALUE
-Image_threshold(VALUE self, VALUE threshold)
+Image_threshold(VALUE self, VALUE threshold_obj)
 {
     Image *image, *new_image;
+    double threshold = NUM2DBL(threshold_obj);
 
     image = rm_check_destroyed(self);
     new_image = rm_clone_image(image);
 
-    (void) BilevelImageChannel(new_image, DefaultChannels, NUM2DBL(threshold));
+    (void) BilevelImageChannel(new_image, DefaultChannels, threshold);
     rm_check_image_exception(new_image, DestroyOnError);
 
     return rm_image_new(new_image);
@@ -13631,7 +13455,7 @@ VALUE
 Image_tint(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
-    Pixel *tint;
+    PixelColor tint;
     double red_pct_opaque, green_pct_opaque, blue_pct_opaque;
     double alpha_pct_opaque = 1.0;
     char opacity[50];
@@ -13680,10 +13504,10 @@ Image_tint(int argc, VALUE *argv, VALUE self)
             "%g,%g,%g,%g", red_pct_opaque*100.0, green_pct_opaque*100.0
             , blue_pct_opaque*100.0, alpha_pct_opaque*100.0);
 
-    Data_Get_Struct(argv[0], Pixel, tint);
+    Color_to_PixelColor(&tint, argv[0]);
     exception = AcquireExceptionInfo();
 
-    new_image = TintImage(image, opacity, *tint, exception);
+    new_image = TintImage(image, opacity, tint, exception);
     rm_check_exception(exception, new_image, DestroyOnError);
 
     (void) DestroyExceptionInfo(exception);
@@ -13803,12 +13627,12 @@ VALUE
 Image_to_color(VALUE self, VALUE pixel_arg)
 {
     Image *image;
-    Pixel *pixel;
+    PixelColor pixel;
     ExceptionInfo *exception;
     char name[MaxTextExtent];
 
     image = rm_check_destroyed(self);
-    Data_Get_Struct(pixel_arg, Pixel, pixel);
+    Color_to_PixelColor(&pixel, pixel_arg);
     exception = AcquireExceptionInfo();
 
     // QueryColorname returns False if the color represented by the PixelPacket
@@ -13816,7 +13640,7 @@ Image_to_color(VALUE self, VALUE pixel_arg)
     // about that.
 
     name[0] = '\0';
-    (void) QueryColorname(image, pixel, AllCompliance, name, exception);
+    (void) QueryColorname(image, &pixel, AllCompliance, name, exception);
     CHECK_EXCEPTION()
 
     (void) DestroyExceptionInfo(exception);
@@ -13896,7 +13720,7 @@ VALUE
 Image_transparent(int argc, VALUE *argv, VALUE self)
 {
     Image *image, *new_image;
-    MagickPixelPacket color;
+    MagickPixel color;
     Quantum opacity = TransparentOpacity;
     MagickBooleanType okay;
 
@@ -13907,7 +13731,7 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
         case 2:
             opacity = APP2QUANTUM(argv[1]);
         case 1:
-            Color_to_MagickPixelPacket(image, &color, argv[0]);
+            Color_to_MagickPixel(image, &color, argv[0]);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
@@ -13916,17 +13740,13 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
 
     new_image = rm_clone_image(image);
 
-#if defined(HAVE_TRANSPARENTPAINTIMAGE)
     okay = TransparentPaintImage(new_image, &color, opacity, MagickFalse);
-#else
-    okay = PaintTransparentImage(new_image, &color, opacity);
-#endif
     rm_check_image_exception(new_image, DestroyOnError);
     if (!okay)
     {
         // Force exception
         DestroyImage(new_image);
-        rm_magick_error("TransparentPaintImage failed with no explanation", NULL);
+        rm_magick_error("TransparentPaintImage failed with no explanation");
     }
 
     return rm_image_new(new_image);
@@ -13954,10 +13774,9 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_TRANSPARENTPAINTIMAGECHROMA)
     Image *image, *new_image;
     Quantum opacity = TransparentOpacity;
-    MagickPixelPacket low, high;
+    MagickPixel low, high;
     MagickBooleanType invert = MagickFalse;
     MagickBooleanType okay;
 
@@ -13970,8 +13789,8 @@ Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
         case 3:
             opacity = APP2QUANTUM(argv[2]);
         case 2:
-            Color_to_MagickPixelPacket(image, &high, argv[1]);
-            Color_to_MagickPixelPacket(image, &low, argv[0]);
+            Color_to_MagickPixel(image, &high, argv[1]);
+            Color_to_MagickPixel(image, &low, argv[0]);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 2, 3 or 4)", argc);
@@ -13986,17 +13805,10 @@ Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
     {
         // Force exception
         DestroyImage(new_image);
-        rm_magick_error("TransparentPaintImageChroma failed with no explanation", NULL);
+        rm_magick_error("TransparentPaintImageChroma failed with no explanation");
     }
 
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-    argc = argc;
-    argv = argv;
-    self = self;
-#endif
 }
 
 
@@ -14013,7 +13825,7 @@ VALUE
 Image_transparent_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return rm_pixelpacket_to_color_name(image, &image->transparent_color);
+    return rm_pixelcolor_to_color_name(image, &image->transparent_color);
 }
 
 
@@ -14031,7 +13843,7 @@ VALUE
 Image_transparent_color_eq(VALUE self, VALUE color)
 {
     Image *image = rm_check_frozen(self);
-    Color_to_PixelPacket(&image->transparent_color, color);
+    Color_to_PixelColor(&image->transparent_color, color);
     return self;
 }
 
@@ -14322,21 +14134,14 @@ VALUE Image_image_type_eq(VALUE self, VALUE image_type)
 VALUE
 Image_undefine(VALUE self, VALUE artifact)
 {
-#if defined(HAVE_REMOVEIMAGEARTIFACT)
     Image *image;
     char *key;
     long key_l;
 
     image = rm_check_frozen(self);
     key = rm_str2cstr(artifact, &key_l);
-    (void) RemoveImageArtifact(image, key);
+    (void) DeleteImageArtifact(image, key);
     return self;
-#else
-    rm_not_implemented();
-    artifact = artifact;
-    self = self;
-    return(VALUE)0;
-#endif
 }
 
 
@@ -14769,9 +14574,7 @@ Image_watermark(int argc, VALUE *argv, VALUE self)
 
     blend_geometry(geometry, sizeof(geometry), src_percent, dst_percent);
     (void) CloneString(&overlay->geometry, geometry);
-#if defined(HAVE_SETIMAGEARTIFACT)
     (void) SetImageArtifact(overlay,"compose:args", geometry);
-#endif
 
     new_image = rm_clone_image(image);
     (void) CompositeImage(new_image, ModulateCompositeOp, overlay, x_offset, y_offset);
@@ -14946,12 +14749,7 @@ Image_wet_floor(int argc, VALUE *argv, VALUE self)
             opacity = TransparentOpacity;
         }
 
-
-#if defined(HAVE_GETVIRTUALPIXELS)
         p = GetVirtualPixels(reflection, 0, y, image->columns, 1, exception);
-#else
-        p = AcquireImagePixels(reflection, 0, y, image->columns, 1, exception);
-#endif
         rm_check_exception(exception, reflection, DestroyOnError);
         if (!p)
         {
@@ -14959,11 +14757,8 @@ Image_wet_floor(int argc, VALUE *argv, VALUE self)
             goto error;
         }
 
-#if defined(HAVE_QUEUEAUTHENTICPIXELS)
         q = QueueAuthenticPixels(reflection, 0, y, image->columns, 1, exception);
-#else
-        q = SetImagePixels(reflection, 0, y, image->columns, 1);
-#endif
+
         rm_check_exception(exception, reflection, DestroyOnError);
         if (!q)
         {
@@ -14979,13 +14774,8 @@ Image_wet_floor(int argc, VALUE *argv, VALUE self)
         }
 
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         SyncAuthenticPixels(reflection, exception);
         rm_check_exception(exception, reflection, DestroyOnError);
-#else
-        SyncImagePixels(reflection);
-        rm_check_image_exception(reflection, DestroyOnError);
-#endif
 
         opacity += step;
     }
@@ -15139,7 +14929,7 @@ Image_write(VALUE self, VALUE file)
 
     if (TYPE(file) == T_FILE)
     {
-        OpenFile *fptr;
+        rb_io_t *fptr;
 
         // Ensure file is open - raise error if not
         GetOpenFile(file, fptr);
@@ -15149,7 +14939,7 @@ Image_write(VALUE self, VALUE file)
         strcpy(image->filename, info->filename);
         SetImageInfoFile(info, NULL);
 #else
-        SetImageInfoFile(info, GetWriteFile(fptr));
+        SetImageInfoFile(info, rb_io_stdio_file(fptr));
         memset(image->filename, 0, sizeof(image->filename));
 #endif
     }
@@ -15516,7 +15306,7 @@ static void call_trace_proc(Image *image, const char *which)
             n = sprintf(buffer, "%p", (void *)image);
             buffer[n] = '\0';
             trace_args[2] = rb_str_new2(buffer+2);      // don't use leading 0x
-            trace_args[3] = ID2SYM(THIS_FUNC());
+            trace_args[3] = ID2SYM(rb_frame_this_func());
             (void) rb_funcall2(trace, rm_ID_call, 4, (VALUE *)trace_args);
         }
     }