rmagick 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc6ac748ddb89b0be62b816518a4193167fb74eab1d482187a2e8fc5b3bc707
-  data.tar.gz: 509ab59e79d7ba1a47e18dacdf5032a014df73e791c63313f1faa88efc1a6a64
+  metadata.gz: ee811873773369d58f0dc4111203635ef513ef4f71563e9c89b18370c11c4c15
+  data.tar.gz: 2b8c09fc168e2709803328a71d8465e4ea64f5b4ce01370021cd7ba63b4dbed8
 SHA512:
-  metadata.gz: eaf280335cb5d4e9fc67c769d3b91308ab84689012e399eaf92043ab4058655fcac0087836bfed05647e2f813c30d823f9d664cc31143a02b7ba76c0747b412d
-  data.tar.gz: 8d08619eb5ae6bf689e0c05d59da465d9b53c1c090733fe723d5d0f020e332bafc841860f86b6d38e21bb85fb12da59ebf2a97e3a6f8136f9c405565c8c01d64
+  metadata.gz: 304f95885436b898fb2dbb609123583c17fae2a1ae78442fa0e5f6c4673073aff0f445ab5b31e699db56a6e9631ce4109cd16dde93ef974bb4b216aadbbcbc7c
+  data.tar.gz: 9e5b5ab7b36cb5f26e3c878b01b3694ddaa10829dfca6049e314e961f8514a9f6495ce2f3ea6a6e78d78871b08c6a6171c0b77f72994547982cb5efb481b7a06

data/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.0.0
+
+This release removes a *lot* of deprecated functionality, so first upgrade to
+3.2 and handle any deprecation warnings you see there before upgrading to 4.0.
+There are a handful of removals that we could not, or forgot to deprecate, so
+pay special attention to those below. This clears the road for ImageMagick 7
+support in the very near future.
+
+Breaking Changes:
+
+- Removed deprecated Image#matte and Image#matte= (#731)
+- Removed deprecated Draw#matte. (#736)
+- Removed deprecated ImageList#fx. (#732)
+- Removed deprecated Info#group and Info#group=. (#733)
+- Removed deprecated KernelInfo#show. (#734)
+- Removed deprecated Pixel#opacity and Pixel#opacity=. (#735)
+- Removed deprecated KernelInfo#zero_nans. (#741)
+- Removed deprecated ImageList#map (#740)
+- Removed deprecated Pixel#from_HSL. (#742)
+- Removed deprecated Image#alpha=. (#739)
+- Removed deprecated Pixel#to_HSL. (#745)
+- Removed deprecated Image#blur and Image#blur=. (#746)
+- Removed deprecated Image#sync_profiles. (#754)
+- Removed deprecated Image#opacity=. (#753)
+- Removed deprecated Image#combine. (#752)
+- Removed deprecated Image#map. (#751)
+- Removed deprecated Image#mask=. (#750)
+- Removed deprecated opacity arguments. (#757)
+- Removed deprecated `OpaqueOpacity` and `TransparentOpacity`. (#765)
+- Removed obsolete enumerations. (#766)
+
+The following changes *did not have deprecation warnings* in 3.2, so you'll
+want to double check that you update your code if you were relying on the
+existing behavior:
+
+- Changed Color#to_s to return an string that contains alpha instead of opacity. (#760)
+- Changed Pixel#to_s to return a string that contains alpha instead of opacity. (#762)
+- Changed Pixel#hash to use alpha instead of opacity. (#763)
+- Changed Pixel#<=> to use alpha instead of opacity. (#764)
+- Removed `BicubicInterpolatePixel` (use `CatromInterpolatePixel` instead) (#768)
+- Removed `FilterInterpolatePixel` (no replacement) (#768)
+- Renamed `NearestNeighborInterpolatePixel` to `NearestInterpolatePixel` (#768)
+
+Enhancements:
+
+- Add SetQuantumOperator (#755)
+
+Bug Fixes:
+
+- Fix SEGV in Image#each_profile (#737)
+
 ## RMagick 3.2.0
 
 This is expected to be the final deprecation release before RMagick 4.0. We

data/examples/crop_with_gravity.rb

@@ -16,7 +16,8 @@ regwidth = shorts.columns / 2
 regheight = shorts.rows / 2
 
 mask = Image.new(regwidth, regheight) { self.background_color = 'white' }
-mask.opacity = 0.50 * TransparentOpacity
+mask.alpha(Magick::ActivateAlphaChannel)
+mask.quantum_operator(SetQuantumOperator, 0.50 * QuantumRange, AlphaChannel)
 
 black = Image.new(shorts.columns, shorts.rows) { self.background_color = 'black' }
 pairs = ImageList.new

data/examples/histogram.rb

@@ -21,7 +21,7 @@ module Magick
       self.red = bg.red
       self.green = bg.green
       self.blue = bg.blue
-      self.opacity = bg.opacity
+      self.alpha = bg.alpha
     end
   end
 
@@ -97,7 +97,7 @@ module Magick
             blue_column[y].green = 0
             rgb_column[y].blue = QuantumRange
           end
-          int_column[y].opacity = TransparentOpacity if yf >= HISTOGRAM_ROWS - (int[x] * scale)
+          int_column[y].alpha = TransparentAlpha if yf >= HISTOGRAM_ROWS - (int[x] * scale)
         end
 
         rgb_histogram.store_pixels(x, 0, 1, HISTOGRAM_ROWS, rgb_column)

data/examples/identify.rb

@@ -20,16 +20,16 @@ module Magick
         puts "\t\tRed: #{channel_depth(Magick::RedChannel)}-bits\n"
         puts "\t\tGreen: #{channel_depth(Magick::GreenChannel)}-bits\n"
         puts "\t\tBlue: #{channel_depth(Magick::BlueChannel)}-bits\n"
-        puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
+        puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if alpha
       when Magick::CMYKColorspace
         puts "\t\tCyan : #{channel_depth(Magick::CyanChannel)}-bits\n"
         puts "\t\tMagenta: #{channel_depth(Magick::MagentaChannel)}-bits\n"
         puts "\t\tYellow: #{channel_depth(Magick::YellowChannel)}-bits\n"
         puts "\t\tBlack: #{channel_depth(Magick::BlackChannel)}-bits\n"
-        puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
+        puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if alpha
       when Magick::GRAYColorspace
         puts "\t\tGray: #{channel_depth(Magick::GrayChannel)}-bits\n"
-        puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
+        puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if alpha
       end
       scale = Magick::QuantumRange / (Magick::QuantumRange >> (Magick::MAGICKCORE_QUANTUM_DEPTH - channel_depth))
       puts "\tChannel statistics:\n"
@@ -78,7 +78,7 @@ module Magick
         puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[0] / scale, channel_mean(Magick::GrayChannel)[0] / Magick::QuantumRange)
         puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[1] / scale, channel_mean(Magick::GrayChannel)[1] / Magick::QuantumRange)
       end
-      if matte
+      if alpha
         puts "\t\tOpacity:\n"
         puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[0] / scale, channel_extrema(Magick::OpacityChannel)[0] / Magick::QuantumRange)
         puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[1] / scale, channel_extrema(Magick::OpacityChannel)[1] / Magick::QuantumRange)

data/examples/vignette.rb

@@ -45,18 +45,18 @@ gc.draw(oval)
 
 oval = oval.blur_image(0, 20)
 
-# The CopyOpacityCompositeOp transforms the opacity level of each image pixel
+# The CopyAlphaCompositeOp transforms the opacity level of each image pixel
 # according to the intensity of the composite image pixels. In this case, the
 # black pixels outside the oval become transparent and the white pixels inside
 # the oval remain opaque. Each gray pixel around the border of the oval has a
 # varying level of transparency depending on how dark or light it is.
 
 ballerina.alpha(Magick::ActivateAlphaChannel)  # Ensure the ballerina image's opacity channel is enabled.
-oval.alpha(Magick::DeactivateAlphaChannel)     # Force the CopyOpacityCompositeOp to use pixel intensity
+oval.alpha(Magick::DeactivateAlphaChannel)     # Force the CopyAlphaCompositeOp to use pixel intensity
 # to determine how much transparency to add to the ballerina
 # pixels.
 
-ballerina = ballerina.composite(oval, CenterGravity, CopyOpacityCompositeOp)
+ballerina = ballerina.composite(oval, CenterGravity, CopyAlphaCompositeOp)
 
 # Since the vignette has multiple levels of transparency, we can't
 # save it as a GIF or a JPEG. The PNG format can handle it, though.

data/ext/RMagick/rmagick.h

@@ -234,6 +234,7 @@ typedef enum _QuantumExpressionOperator
     PoissonNoiseQuantumOperator, /**< poisson noise */
     UniformNoiseQuantumOperator, /**< uniform noise */
     CosineQuantumOperator,    /**< cosine */
+    SetQuantumOperator,       /**< set */
     SineQuantumOperator,      /**< sine */
     AddModulusQuantumOperator, /**< add modulus */
     MeanQuantumOperator, /**< mean */
@@ -607,8 +608,6 @@ extern VALUE ImageList_composite_layers(int, VALUE *, VALUE);
 extern VALUE ImageList_deconstruct(VALUE);
 extern VALUE ImageList_display(VALUE);
 extern VALUE ImageList_flatten_images(VALUE);
-extern VALUE ImageList_fx(int, VALUE *, VALUE);
-extern VALUE ImageList_map(int, VALUE *, VALUE);
 extern VALUE ImageList_montage(VALUE);
 extern VALUE ImageList_morph(VALUE, VALUE);
 extern VALUE ImageList_mosaic(VALUE);
@@ -645,7 +644,6 @@ ATTR_ACCESSOR(Info, font)
 ATTR_ACCESSOR(Info, format)
 ATTR_ACCESSOR(Info, fuzz)
 ATTR_ACCESSOR(Info, gravity)
-ATTR_ACCESSOR(Info, group)
 ATTR_ACCESSOR(Info, image_type)
 ATTR_ACCESSOR(Info, interlace)
 ATTR_ACCESSOR(Info, label)
@@ -689,9 +687,7 @@ extern GravityType rm_gravity_to_enum(const char *);
 extern VALUE KernelInfo_alloc(VALUE);
 
 extern VALUE KernelInfo_initialize(VALUE, VALUE);
-extern VALUE KernelInfo_zero_nans(VALUE);
 extern VALUE KernelInfo_unity_add(VALUE, VALUE);
-extern VALUE KernelInfo_show(VALUE);
 extern VALUE KernelInfo_scale(VALUE, VALUE, VALUE);
 extern VALUE KernelInfo_scale_geometry(VALUE, VALUE);
 extern VALUE KernelInfo_clone(VALUE);
@@ -700,14 +696,12 @@ extern VALUE KernelInfo_builtin(VALUE, VALUE, VALUE);
 
 
 // rmimage.c
-ATTR_WRITER(Image, alpha)
 ATTR_ACCESSOR(Image, background_color)
 ATTR_READER(Image, base_columns)
 ATTR_READER(Image, base_filename)
 ATTR_READER(Image, base_rows)
 ATTR_ACCESSOR(Image, bias)
 ATTR_ACCESSOR(Image, black_point_compensation)
-ATTR_ACCESSOR(Image, blur)
 ATTR_ACCESSOR(Image, border_color)
 ATTR_READER(Image, bounding_box)
 ATTR_ACCESSOR(Image, chromaticity)
@@ -737,8 +731,6 @@ ATTR_ACCESSOR(Image, image_type)
 ATTR_ACCESSOR(Image, interlace)
 ATTR_ACCESSOR(Image, iptc_profile)
 ATTR_ACCESSOR(Image, iterations)
-ATTR_WRITER(Image, mask)
-ATTR_ACCESSOR(Image, matte)
 ATTR_ACCESSOR(Image, matte_color)
 ATTR_READER(Image, mean_error_per_pixel)
 ATTR_READER(Image, mime_type)
@@ -748,7 +740,6 @@ ATTR_READER(Image, normalized_mean_error)
 ATTR_READER(Image, normalized_maximum_error)
 ATTR_READER(Image, number_colors)
 ATTR_ACCESSOR(Image, offset)
-ATTR_WRITER(Image, opacity)
 ATTR_ACCESSOR(Image, orientation)
 ATTR_ACCESSOR(Image, page)
 ATTR_ACCESSOR(Image, pixel_interpolation_method)
@@ -819,7 +810,6 @@ extern VALUE Image_color_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_color_histogram(VALUE);
 extern VALUE Image_colorize(int, VALUE *, VALUE);
 extern VALUE Image_colormap(int, VALUE *, VALUE);
-extern VALUE Image_combine(int, VALUE *, VALUE);
 extern VALUE Image_composite(int, VALUE *, VALUE);
 extern VALUE Image_composite_affine(VALUE, VALUE, VALUE);
 extern VALUE Image_composite_bang(int, VALUE *, VALUE);
@@ -899,7 +889,6 @@ extern VALUE Image_liquid_rescale(int, VALUE *, VALUE);
 extern VALUE Image__load(VALUE, VALUE);
 extern VALUE Image_magnify(VALUE);
 extern VALUE Image_magnify_bang(VALUE);
-extern VALUE Image_map(int, VALUE *, VALUE);
 extern VALUE Image_marshal_dump(VALUE);
 extern VALUE Image_marshal_load(VALUE, VALUE);
 extern VALUE Image_mask(int, VALUE *, VALUE);
@@ -975,7 +964,6 @@ extern VALUE Image_stereo(VALUE, VALUE);
 extern VALUE Image_store_pixels(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_strip_bang(VALUE);
 extern VALUE Image_swirl(VALUE, VALUE);
-extern VALUE Image_sync_profiles(VALUE);
 extern VALUE Image_texture_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_threshold(VALUE, VALUE);
 extern VALUE Image_thumbnail(int, VALUE *, VALUE);
@@ -1024,7 +1012,6 @@ ATTR_ACCESSOR(Pixel, red)
 ATTR_ACCESSOR(Pixel, green)
 ATTR_ACCESSOR(Pixel, blue)
 ATTR_ACCESSOR(Pixel, alpha)
-ATTR_ACCESSOR(Pixel, opacity)
 ATTR_ACCESSOR(Pixel, cyan)
 ATTR_ACCESSOR(Pixel, magenta)
 ATTR_ACCESSOR(Pixel, yellow)
@@ -1037,7 +1024,6 @@ extern VALUE  Pixel_dup(VALUE);
 extern VALUE  Pixel_eql_q(VALUE, VALUE);
 extern VALUE  Pixel_fcmp(int, VALUE *, VALUE);
 extern VALUE  Pixel_from_color(VALUE, VALUE);
-extern VALUE  Pixel_from_HSL(VALUE, VALUE);
 extern VALUE  Pixel_from_hsla(int, VALUE *, VALUE);
 extern VALUE  Pixel_hash(VALUE);
 extern VALUE  Pixel_initialize(int, VALUE *, VALUE);
@@ -1047,7 +1033,6 @@ extern VALUE  Pixel_marshal_dump(VALUE);
 extern VALUE  Pixel_marshal_load(VALUE, VALUE);
 extern VALUE  Pixel_spaceship(VALUE, VALUE);
 extern VALUE  Pixel_to_color(int, VALUE *, VALUE);
-extern VALUE  Pixel_to_HSL(VALUE);
 extern VALUE  Pixel_to_hsla(VALUE);
 extern VALUE  Pixel_to_s(VALUE);
 

data/ext/RMagick/rmilist.c

@@ -426,132 +426,6 @@ ImageList_flatten_images(VALUE self)
 }
 
 
-/**
- * Apply fx on the images.
- *
- * Ruby usage:
- *   - @verbatim ImageList#fx(expression) @endverbatim
- *   - @verbatim ImageList#fx(expression, channel) @endverbatim
- *   - @verbatim ImageList#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
- * @deprecated This method has been deprecated. Please use Image_fx.
- */
-VALUE
-ImageList_fx(int argc, VALUE *argv, VALUE self)
-{
-    Image *images, *new_image;
-    char *expression;
-    ChannelType channels;
-    ExceptionInfo *exception;
-
-    rb_warning("ImageList#fx is deprecated; use Image#fx");
-
-    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]);
-
-    images = images_from_imagelist(self);
-    exception = AcquireExceptionInfo();
-    new_image = FxImageChannel(images, channels, expression, exception);
-    rm_split(images);
-    rm_check_exception(exception, new_image, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_image);
-
-    return rm_image_new(new_image);
-}
-
-
-/**
- * Call MapImages.
- *
- * Ruby usage:
- *   - @verbatim ImageList#map(reference) @endverbatim
- *   - @verbatim ImageList#map(reference, dither) @endverbatim
- *
- * Notes:
- *   - Default dither is false
- *   - Sets \@scene to self.scene
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return a new ImageList with mapped images.
- */
-VALUE
-ImageList_map(int argc, VALUE *argv, VALUE self)
-{
-    Image *images, *new_images = NULL;
-    Image *map;
-    unsigned int dither = MagickFalse;
-    VALUE scene, new_imagelist, t;
-    ExceptionInfo *exception;
-
-    QuantizeInfo quantize_info;
-    rb_warning("ImageList#map is deprecated. Use ImageList#remap instead.");
-
-    switch (argc)
-    {
-        case 2:
-            dither = RTEST(argv[1]);
-        case 1:
-            t = rm_cur_image(argv[0]);
-            map = rm_check_destroyed(t);
-            break;
-        default:
-            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
-            break;
-    }
-
-
-    // Convert image array to image sequence, clone image sequence.
-    images = images_from_imagelist(self);
-
-    exception = AcquireExceptionInfo();
-    new_images = CloneImageList(images, exception);
-    rm_split(images);
-    rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_images);
-
-    // Call ImageMagick
-    GetQuantizeInfo(&quantize_info);
-    quantize_info.dither = dither;
-    (void) RemapImages(&quantize_info, new_images, map);
-    rm_check_image_exception(new_images, DestroyOnError);
-
-    // Set @scene in new ImageList object to same value as in self.
-    new_imagelist = rm_imagelist_from_images(new_images);
-    scene = rb_iv_get(self, "@scene");
-    (void) imagelist_scene_eq(new_imagelist, scene);
-
-    RB_GC_GUARD(scene);
-    RB_GC_GUARD(new_imagelist);
-    RB_GC_GUARD(t);
-
-    return new_imagelist;
-}
-
-
 /**
  * Call MontageImages.
  *

data/ext/RMagick/rmimage.c

@@ -41,22 +41,6 @@ static void call_trace_proc(Image *, const char *);
 static const char *BlackPointCompensationKey = "PROFILE:black-point-compensation";
 
 
-/**
- * Converts the opacity value to alpha and raises a warning.
- *
- * No Ruby usage (internal function)
- *
- * @opacity an opacity value
- */
-static Quantum
-get_alpha_from_opacity(VALUE opacity)
-{
-    VALUE method = rb_id2str(rb_frame_this_func());
-    rb_warning("Image#%"PRIsVALUE" requires a named argument for 'alpha' and now expects an alpha value instead of an opacity value.", method);
-
-    return QuantumRange - APP2QUANTUM(opacity);
-}
-
 /**
  * Returns the alpha value from the hash.
  *
@@ -65,8 +49,13 @@ get_alpha_from_opacity(VALUE opacity)
  * @hash the hash
  */
 static Quantum
-get_alpha_from_hash(VALUE hash)
+get_named_alpha_value(VALUE hash)
 {
+    if (TYPE(hash) != T_HASH)
+    {
+        rb_raise(rb_eArgError, "missing keyword: alpha");
+    }
+    
     if (FIX2ULONG(rb_hash_size(hash)) != 1)
     {
         rb_raise(rb_eArgError, "wrong number of arguments");
@@ -81,25 +70,6 @@ get_alpha_from_hash(VALUE hash)
     return APP2QUANTUM(alpha);
 }
 
-/**
- * Checks if opacity_or_alpha is a named argument called alpha and returns the alpha value or
- * converts the unnamed opacity value to alpha.
- *
- * No Ruby usage (internal function)
- *
- * @opacity_or_alpha an opacity or a named alpha value
- */
-static Quantum
-get_named_alpha_value(VALUE opacity_or_alpha)
-{
-    if (TYPE(opacity_or_alpha) != T_HASH)
-    {
-        return get_alpha_from_opacity(opacity_or_alpha);
-    }
-
-    return get_alpha_from_hash(opacity_or_alpha);
-}
-
 
 /**
  * Call Adaptive(Blur|Sharpen)Image.
@@ -672,30 +642,6 @@ Image_alpha_q(VALUE self)
 }
 
 
-/**
- * Equivalent to -alpha option.
- *
- * Ruby usage:
- *   - @verbatim Image#alpha=(alpha) @endverbatim
- *
- * @param self this object
- * @param type the alpha type
- * @return alpha
- * @deprecated This method has been deprecated. Please use Image_alpha.
- * @see Image_alpha
- * @see mogrify.c (in ImageMagick)
- */
-VALUE
-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;
-}
-
-
 /**
  * Transform an image as dictated by the affine matrix argument.
  *
@@ -1363,7 +1309,6 @@ get_relative_offsets(VALUE grav, Image *image, Image *mark, long *x_offset, long
         case NorthGravity:
         case SouthGravity:
         case CenterGravity:
-        case StaticGravity:
             *x_offset += (long)(image->columns/2) - (long)(mark->columns/2);
             break;
         default:
@@ -1379,7 +1324,6 @@ get_relative_offsets(VALUE grav, Image *image, Image *mark, long *x_offset, long
         case EastGravity:
         case WestGravity:
         case CenterGravity:
-        case StaticGravity:
             *y_offset += (long)(image->rows/2) - (long)(mark->rows/2);
             break;
         case NorthEastGravity:
@@ -1429,7 +1373,6 @@ get_offsets_from_gravity(GravityType gravity, Image *image, Image *mark
             *x_offset = 0;
             *y_offset = ((long)(image->rows) - (long)(mark->rows)) / 2;
             break;
-        case StaticGravity:
         case CenterGravity:
         default:
             *x_offset = ((long)(image->columns) - (long)(mark->columns)) / 2;
@@ -1756,53 +1699,6 @@ Image_blue_shift(int argc, VALUE *argv, VALUE self)
 }
 
 
-/**
- * Get the blur attribute.
- *
- * Ruby usage:
- *   - @verbatim Image#blur @endverbatim
- *
- * @param self this object
- * @return the blur
- * @deprecated This method has been deprecated.
- */
-VALUE
-Image_blur(VALUE self)
-{
-    Image *image;
-
-    rb_warning("Image#blur is deprecated");
-    (void) rm_check_destroyed(self);
-    Data_Get_Struct(self, Image, image);
-    return C_dbl_to_R_dbl(image->blur);
-}
-
-
-/**
- * Set the blur attribute.
- *
- * Ruby usage:
- *   - @verbatim Image#blur= @endverbatim
- *
- * @param self this object
- * @param value the blur
- * @return value
- * @deprecated This method has been deprecated.
- */
-VALUE
-Image_blur_eq(VALUE self, VALUE value)
-{
-    Image *image;
-
-    rb_warning("Image#blur= is deprecated");
-    (void) rm_check_destroyed(self);
-    rb_check_frozen(self);
-    Data_Get_Struct(self, Image, image);
-    image->blur = R_dbl_to_C_dbl(value);
-    return value;
-}
-
-
 /**
  * Call BlurImageChannel.
  *
@@ -3127,88 +3023,6 @@ Image_colorspace_eq(VALUE self, VALUE colorspace)
 DEF_ATTR_READER(Image, columns, int)
 
 
-/**
- * Combine the Red channel of the first image with the Green channel of the
- * 2nd image and the Blue channel of the 3rd image. Any of the image arguments
- * may be omitted or replaced by nil.
- *
- * Ruby usage:
- *   - @verbatim new_image = Image.combine(red) @endverbatim
- *   - @verbatim new_image = Image.combine(red, green) @endverbatim
- *   - @verbatim new_image = Image.combine(red, green, blue) @endverbatim
- *   - @verbatim new_image = Image.combine(red, green, blue, opacity) @endverbatim
- *
- * Notes:
- *   - Calls CombineImages.
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return a new image
- * @deprecated This method has been deprecated. Please use ImageList_combine.
- */
-VALUE Image_combine(int argc, VALUE *argv, VALUE self ATTRIBUTE_UNUSED)
-{
-    ChannelType channel = 0;
-    Image *image, *images = NULL, *new_image;
-    ExceptionInfo *exception;
-
-    rb_warning("Image#combine is deprecated; use ImageList#combine.");
-
-    switch (argc)
-    {
-        case 4:
-            if (argv[3] != Qnil)
-            {
-                channel |= OpacityChannel;
-                image = rm_check_destroyed(argv[3]);
-                AppendImageToList(&images, image);
-            }
-        case 3:
-            if (argv[2] != Qnil)
-            {
-                channel |= BlueChannel;
-                image = rm_check_destroyed(argv[2]);
-                AppendImageToList(&images, image);
-            }
-        case 2:
-            if (argv[1] != Qnil)
-            {
-                channel |= GreenChannel;
-                image = rm_check_destroyed(argv[1]);
-                AppendImageToList(&images, image);
-            }
-        case 1:
-            if (argv[0] != Qnil)
-            {
-                channel |= RedChannel;
-                image = rm_check_destroyed(argv[0]);
-                AppendImageToList(&images, image);
-            }
-            break;
-        default:
-            rb_raise(rb_eArgError, "wrong number of arguments (1 to 4 expected, got %d)", argc);
-    }
-
-    if (channel == 0)
-    {
-        rb_raise(rb_eArgError, "no images to combine");
-    }
-
-    exception = AcquireExceptionInfo();
-    ReverseImageList(&images);
-    new_image = CombineImages(images, channel, exception);
-    rm_check_exception(exception, images, RetainOnError);
-    (void) DestroyExceptionInfo(exception);
-    rm_split(images);
-
-    rm_ensure_result(new_image);
-
-    return rm_image_new(new_image);
-
-}
-
-
 /**
  * Compare one or more channels in two images and returns the specified
  * distortion metric and a comparison image.
@@ -3393,7 +3207,6 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
                     x_offset = 0;
                     y_offset = ((long)(image->rows) - (long)(comp_image->rows)) / 2;
                     break;
-                case StaticGravity:
                 case CenterGravity:
                 default:
                     x_offset = ((long)(image->columns) - (long)(comp_image->columns)) / 2;
@@ -3441,7 +3254,6 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
                 case NorthGravity:
                 case SouthGravity:
                 case CenterGravity:
-                case StaticGravity:
                     x_offset += (long)(image->columns/2) - (long)(comp_image->columns/2);
                     break;
                 default:
@@ -3457,7 +3269,6 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
                 case EastGravity:
                 case WestGravity:
                 case CenterGravity:
-                case StaticGravity:
                     y_offset += (long)(image->rows/2) - (long)(comp_image->rows/2);
                     break;
                 case NorthEastGravity:
@@ -5546,7 +5357,8 @@ VALUE
 Image_each_profile(VALUE self)
 {
     Image *image;
-    VALUE ary, val;
+    VALUE ary;
+    VALUE val = Qnil;
     char *name;
     const StringInfo *profile;
 
@@ -6268,9 +6080,6 @@ Image_export_pixels_to_str(int argc, VALUE *argv, VALUE self)
         case FloatPixel:
             sz = sizeof(float);
             break;
-        case IntegerPixel:
-            sz = sizeof(unsigned int);
-            break;
         case LongPixel:
             sz = sizeof(unsigned long);
             break;
@@ -7492,9 +7301,6 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
             case ShortPixel:
                 type_sz = sizeof(unsigned short);
                 break;
-            case IntegerPixel:
-                type_sz = sizeof(unsigned int);
-                break;
             case LongPixel:
                 type_sz = sizeof(unsigned long);
                 break;
@@ -8384,63 +8190,6 @@ Image_magnify_bang(VALUE self)
 }
 
 
-/**
- * Call MapImage.
- *
- * Ruby usage:
- *   - @verbatim Image#map(map_image) @endverbatim
- *   - @verbatim Image#map(map_image, dither) @endverbatim
- *
- * Notes:
- *   - Default dither is false
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return a new image
- */
-VALUE
-Image_map(int argc, VALUE *argv, VALUE self)
-{
-    Image *image, *new_image;
-    Image *map;
-    VALUE map_obj, map_arg;
-    unsigned int dither = MagickFalse;
-
-    QuantizeInfo quantize_info;
-    rb_warning("Image#map is deprecated. Use Image#remap instead");
-
-    image = rm_check_destroyed(self);
-
-    switch (argc)
-    {
-        case 2:
-            dither = RTEST(argv[1]);
-        case 1:
-            map_arg = argv[0];
-            break;
-        default:
-            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
-            break;
-    }
-
-    map_obj = rm_cur_image(map_arg);
-    map = rm_check_destroyed(map_obj);
-
-    new_image = rm_clone_image(image);
-
-    GetQuantizeInfo(&quantize_info);
-    quantize_info.dither=dither;
-    (void) RemapImage(&quantize_info, new_image, map);
-    rm_check_image_exception(new_image, DestroyOnError);
-
-    RB_GC_GUARD(map_obj);
-    RB_GC_GUARD(map_arg);
-
-    return rm_image_new(new_image);
-}
-
-
 /**
  * Support Marshal.dump >= 1.8.
  *
@@ -8648,29 +8397,6 @@ set_image_mask(Image *image, VALUE mask)
 }
 
 
-/**
- * Set the image mask.
- *
- * Ruby usage:
- *   - @verbatim Image#mask= @endverbatim
- *
- * @param self this object
- * @param mask the mask to use
- * @return copy of the current clip-mask or nil
- * @deprecated This method has been deprecated. Please use Image_mask(mask-image).
- * @see Image_mask(mask-image)
- * @see get_image_mask
- */
-VALUE
-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);
-}
-
-
 /**
  * Associate a clip mask with the image.
  *
@@ -8715,62 +8441,6 @@ Image_mask(int argc, VALUE *argv, VALUE self)
 }
 
 
-/**
- * Get matte attribute.
- *
- * Ruby usage:
- *   - @verbatim Image#matte @endverbatim
- *
- * @param self this object
- * @return the matte
- * @deprecated This method has been deprecated. Please use Image_alpha.
- * @see Image_alpha
- * @see Image_alpha_eq
- */
-VALUE
-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;
-}
-
-
-/**
- * Set matte attribute.
- *
- * Ruby usage:
- *   - @verbatim Image#matte= @endverbatim
- *
- * @param self this object
- * @param matte the matte
- * @return the matte
- * @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)
-{
-    VALUE alpha_channel_type;
-
-    if (RTEST(matte))
-    {
-        alpha_channel_type = rb_const_get(Module_Magick, rb_intern("ActivateAlphaChannel"));
-    }
-    else
-    {
-        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);
-}
-
-
 /**
  * Return the matte color.
  *
@@ -8831,7 +8501,6 @@ Image_matte_flood_fill(int argc, VALUE *argv, VALUE self)
     DrawInfo *draw_info;
     MagickPixel target_mpp;
     MagickBooleanType invert;
-    int start_index;
 
     image = rm_check_destroyed(self);
 
@@ -8840,26 +8509,17 @@ Image_matte_flood_fill(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "wrong number of arguments (%d for 5)", argc);
     }
 
-    if (TYPE(argv[4]) == T_HASH)
-    {
-        alpha = get_alpha_from_hash(argv[4]);
-        start_index = 1;
-    }
-    else
-    {
-        alpha = get_alpha_from_opacity(argv[1]);
-        start_index = 2;
-    }
+    alpha = get_named_alpha_value(argv[4]);
 
     Color_to_PixelColor(&target, argv[0]);
-    VALUE_TO_ENUM(argv[start_index + 2], method, PaintMethod);
+    VALUE_TO_ENUM(argv[3], method, PaintMethod);
     if (!(method == FloodfillMethod || method == FillToBorderMethod))
     {
         rb_raise(rb_eArgError, "paint method_obj must be FloodfillMethod or "
                  "FillToBorderMethod (%d given)", method);
     }
-    x = NUM2LONG(argv[start_index]);
-    y = NUM2LONG(argv[start_index + 1]);
+    x = NUM2LONG(argv[1]);
+    y = NUM2LONG(argv[2]);
     if ((unsigned long)x > image->columns || (unsigned long)y > image->rows)
     {
         rb_raise(rb_eArgError, "target out of range. %ldx%ld given, image is %lux%lu"
@@ -9325,8 +8985,6 @@ Image_negate_channel(int argc, VALUE *argv, VALUE self)
         grayscale = RTEST(argv[0]);
     }
 
-    Data_Get_Struct(self, Image, image);
-
     new_image = rm_clone_image(image);
 
     (void) NegateImageChannel(new_image, channels, grayscale);
@@ -9968,14 +9626,7 @@ Image_paint_transparent(int argc, VALUE *argv, VALUE self)
                 invert = RTEST(argv[2]);
             }
         case 2:
-            if (TYPE(argv[argc - 1]) == T_HASH)
-            {
-                alpha = get_alpha_from_hash(argv[argc - 1]);
-            }
-            else
-            {
-                alpha = get_alpha_from_opacity(argv[1]);
-            }
+            alpha = get_named_alpha_value(argv[argc - 1]);
         case 1:
             Color_to_MagickPixel(image, &color, argv[0]);
             break;
@@ -10531,6 +10182,9 @@ Image_quantum_operator(int argc, VALUE *argv, VALUE self)
         case CosineQuantumOperator:
             qop = CosineEvaluateOperator;
             break;
+        case SetQuantumOperator:
+            qop = SetEvaluateOperator;
+            break;
         case SineQuantumOperator:
             qop = SineEvaluateOperator;
             break;
@@ -12095,33 +11749,6 @@ Image_segment(int argc, VALUE *argv, VALUE self)
 }
 
 
-/**
- * Call SetImageOpacity.
- *
- * Ruby usage:
- *   - @verbatim Image#opacity= @endverbatim
- *
- * @param self this object
- * @param opacity_arg the opacity
- * @return opacity_arg
- * @deprecated This method has been deprecated. Please use Image_alpha.
- */
-VALUE
-Image_opacity_eq(VALUE self, VALUE opacity_arg)
-{
-    Image *image;
-    Quantum opacity;
-
-    rb_warning("Image#opacity is deprecated; use Image#alpha");
-
-    image = rm_check_frozen(self);
-    opacity = APP2QUANTUM(opacity_arg);
-    (void) SetImageOpacity(image, opacity);
-    rm_check_image_exception(image, RetainOnError);
-    return opacity_arg;
-}
-
-
 /**
  * Traverse the attributes and yield to the block. If no block, return a hash
  * of all the attribute keys & values.
@@ -13245,30 +12872,6 @@ Image_swirl(VALUE self, VALUE degrees_obj)
 }
 
 
-/**
- * Synchronize image properties with the image profiles.
- *
- * Ruby usage:
- *   - @verbatim Image#sync_profiles @endverbatim
- *
- * @param self this object
- * @return true if succeeded, otherwise false
- * @deprecated This method has been deprecated.
- */
-VALUE
-Image_sync_profiles(VALUE self)
-{
-    rb_warning("Image#sync_profiles is deprecated");
-    Image *image = rm_check_destroyed(self);
-    VALUE okay =  SyncImageProfiles(image) ? Qtrue : Qfalse;
-    rm_check_image_exception(image, RetainOnError);
-
-    RB_GC_GUARD(okay);
-
-    return okay;
-}
-
-
 /**
  * Emulates Magick++'s floodFillTexture.
  *
@@ -13967,14 +13570,7 @@ Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
                 invert = RTEST(argv[2]);
             }
         case 3:
-            if (TYPE(argv[argc - 1]) == T_HASH)
-            {
-                alpha = get_alpha_from_hash(argv[argc - 1]);
-            }
-            else
-            {
-                alpha = get_alpha_from_opacity(argv[2]);
-            }
+            alpha = get_named_alpha_value(argv[argc - 1]);
         case 2:
             Color_to_MagickPixel(image, &high, argv[1]);
             Color_to_MagickPixel(image, &low, argv[0]);
@@ -15230,7 +14826,6 @@ cropper(int bang, int argc, VALUE *argv, VALUE self)
                 case NorthGravity:
                 case SouthGravity:
                 case CenterGravity:
-                case StaticGravity:
                     nx += image->columns/2 - columns/2;
                     break;
                 default:
@@ -15246,7 +14841,6 @@ cropper(int bang, int argc, VALUE *argv, VALUE self)
                 case EastGravity:
                 case WestGravity:
                 case CenterGravity:
-                case StaticGravity:
                     ny += image->rows/2 - rows/2;
                     break;
                 case NorthEastGravity:
@@ -15312,7 +14906,6 @@ cropper(int bang, int argc, VALUE *argv, VALUE self)
                     nx = image->columns - columns;
                     ny = image->rows - rows;
                     break;
-                case StaticGravity:
                 case CenterGravity:
                     nx = (image->columns - columns) / 2;
                     ny = (image->rows - rows) / 2;