rmagick 3.2.0 → 4.0.0

data/ext/RMagick/rminfo.c

@@ -1473,8 +1473,7 @@ static struct
     { "SouthEast",  "SouthEastGravity", SouthEastGravity},
     { "South",      "SouthGravity",     SouthGravity},
     { "SouthWest",  "SouthWestGravity", SouthWestGravity},
-    { "West",       "WestGravity",      WestGravity},
-    { "Static",     "StaticGravity",    StaticGravity}
+    { "West",       "WestGravity",      WestGravity}
 };
 
 /** Number of gravity options */
@@ -1588,53 +1587,6 @@ Info_gravity_eq(VALUE self, VALUE grav)
 }
 
 
-/**
- * Get the group attribute.
- *
- * Ruby usage:
- *   - @verbatim Info#group @endverbatim
- *
- * @param self this object
- * @return the group
- * @deprecated This method has been deprecated.
- */
-VALUE
-Info_group(VALUE self)
-{
-    Info *info;
-
-    rb_warning("Info#group is deprecated");
-    (void) rm_check_destroyed(self);
-    Data_Get_Struct(self, Info, info);
-    return C_long_to_R_long(info->group);
-}
-
-
-/**
- * Set the group attribute.
- *
- * Ruby usage:
- *   - @verbatim Info#group= @endverbatim
- *
- * @param self this object
- * @param value the group
- * @return value
- * @deprecated This method has been deprecated.
- */
-VALUE
-Info_group_eq(VALUE self, VALUE value)
-{
-    Info *info;
-
-    rb_warning("Info#group= is deprecated");
-    (void) rm_check_destroyed(self);
-    rb_check_frozen(self);
-    Data_Get_Struct(self, Info, info);
-    info->group = R_long_to_C_long(value);
-    return value;
-}
-
-
 /**
  * Get the classification type.
  *

data/ext/RMagick/rmkinfo.c

@@ -68,26 +68,6 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
     return self;
 }
 
-/**
- * Zero kerne NaNs.
- *
- * Ruby usage:
- *   - @verbatim KernelInfo#zero_nans @endverbatim
- *
- * @param self this object
- * @deprecated This method has been deprecated.
- */
-
-/* ZeroKernelNans() is private function in ImageMagick. */
-MagickExport void ZeroKernelNans(KernelInfo *kernel);
-
-VALUE
-KernelInfo_zero_nans(VALUE self)
-{
-    rb_warning("KernelInfo#zero_nans is deprecated");
-    ZeroKernelNans((KernelInfo*)DATA_PTR(self));
-    return Qnil;
-}
 
 /**
  * Adds a given amount of the 'Unity' Convolution Kernel to the given pre-scaled and normalized Kernel.
@@ -112,22 +92,6 @@ KernelInfo_unity_add(VALUE self, VALUE scale)
     return Qnil;
 }
 
-/**
- * Dumps KernelInfo object to stderr
- *
- * Ruby usage:
- *   - @verbatim KernelInfo#show @endverbatim
- *
- * @param self this object
- * @deprecated This method has been deprecated.
- */
-VALUE
-KernelInfo_show(VALUE self)
-{
-    rb_warning("KernelInfo#show is deprecated");
-    ShowKernelInfo((KernelInfo*)DATA_PTR(self));
-    return Qnil;
-}
 
 /**
  * Scales the given kernel list by the given amount, with or without normalization

data/ext/RMagick/rmmain.c

@@ -210,7 +210,6 @@ Init_RMagick2(void)
     rb_define_alloc_func(Class_Image, Image_alloc);
     rb_define_method(Class_Image, "initialize", Image_initialize, -1);
 
-    rb_define_singleton_method(Class_Image, "combine", Image_combine, -1);
     rb_define_singleton_method(Class_Image, "constitute", Image_constitute, 4);
     rb_define_singleton_method(Class_Image, "_load", Image__load, 1);
     rb_define_singleton_method(Class_Image, "capture", Image_capture, -1);
@@ -219,14 +218,12 @@ Init_RMagick2(void)
     rb_define_singleton_method(Class_Image, "read_inline", Image_read_inline, 1);
     rb_define_singleton_method(Class_Image, "from_blob", Image_from_blob, 1);
 
-    DCL_ATTR_WRITER(Image, alpha)
     DCL_ATTR_ACCESSOR(Image, background_color)
     DCL_ATTR_READER(Image, base_columns)
     DCL_ATTR_READER(Image, base_filename)
     DCL_ATTR_READER(Image, base_rows)
     DCL_ATTR_ACCESSOR(Image, bias)
     DCL_ATTR_ACCESSOR(Image, black_point_compensation)
-    DCL_ATTR_ACCESSOR(Image, blur)
     DCL_ATTR_ACCESSOR(Image, border_color)
     DCL_ATTR_READER(Image, bounding_box)
     DCL_ATTR_ACCESSOR(Image, chromaticity)
@@ -255,8 +252,6 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Image, interlace)
     DCL_ATTR_ACCESSOR(Image, iptc_profile)
     DCL_ATTR_ACCESSOR(Image, iterations)        // do not document! Only used by Image#iterations=
-    DCL_ATTR_WRITER(Image, mask)
-    DCL_ATTR_ACCESSOR(Image, matte)
     DCL_ATTR_ACCESSOR(Image, matte_color)
     DCL_ATTR_READER(Image, mean_error_per_pixel)
     DCL_ATTR_READER(Image, mime_type)
@@ -266,7 +261,6 @@ Init_RMagick2(void)
     DCL_ATTR_READER(Image, normalized_maximum_error)
     DCL_ATTR_READER(Image, number_colors)
     DCL_ATTR_ACCESSOR(Image, offset)
-    DCL_ATTR_WRITER(Image, opacity)
     DCL_ATTR_ACCESSOR(Image, orientation)
     DCL_ATTR_ACCESSOR(Image, page)
     DCL_ATTR_ACCESSOR(Image, pixel_interpolation_method)
@@ -412,7 +406,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "liquid_rescale", Image_liquid_rescale, -1);
     rb_define_method(Class_Image, "magnify", Image_magnify, 0);
     rb_define_method(Class_Image, "magnify!", Image_magnify_bang, 0);
-    rb_define_method(Class_Image, "map", Image_map, -1);
     rb_define_method(Class_Image, "marshal_dump", Image_marshal_dump, 0);
     rb_define_method(Class_Image, "marshal_load", Image_marshal_load, 1);
     rb_define_method(Class_Image, "mask", Image_mask, -1);
@@ -484,7 +477,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "strip!", Image_strip_bang, 0);
     rb_define_method(Class_Image, "store_pixels", Image_store_pixels, 5);
     rb_define_method(Class_Image, "swirl", Image_swirl, 1);
-    rb_define_method(Class_Image, "sync_profiles", Image_sync_profiles, 0);
     rb_define_method(Class_Image, "texture_flood_fill", Image_texture_flood_fill, 5);
     rb_define_method(Class_Image, "threshold", Image_threshold, 1);
     rb_define_method(Class_Image, "thumbnail", Image_thumbnail, -1);
@@ -529,8 +521,6 @@ Init_RMagick2(void)
     rb_define_method(Class_ImageList, "deconstruct", ImageList_deconstruct, 0);
     rb_define_method(Class_ImageList, "display", ImageList_display, 0);
     rb_define_method(Class_ImageList, "flatten_images", ImageList_flatten_images, 0);
-    rb_define_method(Class_ImageList, "fx", ImageList_fx, -1);
-    rb_define_method(Class_ImageList, "map", ImageList_map, -1);
     rb_define_method(Class_ImageList, "montage", ImageList_montage, 0);
     rb_define_method(Class_ImageList, "morph", ImageList_morph, 1);
     rb_define_method(Class_ImageList, "mosaic", ImageList_mosaic, 0);
@@ -637,7 +627,6 @@ Init_RMagick2(void)
     // and the deprecated "from_HSL".
     rb_define_alloc_func(Class_Pixel, Pixel_alloc);
     rb_define_singleton_method(Class_Pixel, "from_color", Pixel_from_color, 1);
-    rb_define_singleton_method(Class_Pixel, "from_HSL", Pixel_from_HSL, 1);
     rb_define_singleton_method(Class_Pixel, "from_hsla", Pixel_from_hsla, -1);
 
     // Define the RGBA attributes
@@ -645,7 +634,6 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Pixel, green)
     DCL_ATTR_ACCESSOR(Pixel, blue)
     DCL_ATTR_ACCESSOR(Pixel, alpha)
-    DCL_ATTR_ACCESSOR(Pixel, opacity)
 
     // Define the CMYK attributes
     DCL_ATTR_ACCESSOR(Pixel, cyan)
@@ -668,7 +656,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Pixel, "marshal_dump", Pixel_marshal_dump, 0);
     rb_define_method(Class_Pixel, "marshal_load", Pixel_marshal_load, 1);
     rb_define_method(Class_Pixel, "to_color", Pixel_to_color, -1);
-    rb_define_method(Class_Pixel, "to_HSL", Pixel_to_HSL, 0);   // deprecated
     rb_define_method(Class_Pixel, "to_hsla", Pixel_to_hsla, 0);
     rb_define_method(Class_Pixel, "to_s", Pixel_to_s, 0);
 
@@ -740,7 +727,6 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Info, format)
     DCL_ATTR_ACCESSOR(Info, fuzz)
     DCL_ATTR_ACCESSOR(Info, gravity)
-    DCL_ATTR_ACCESSOR(Info, group)
     DCL_ATTR_ACCESSOR(Info, image_type)
     DCL_ATTR_ACCESSOR(Info, interlace)
     DCL_ATTR_ACCESSOR(Info, label)
@@ -775,9 +761,7 @@ Init_RMagick2(void)
     rb_define_alloc_func(Class_KernelInfo, KernelInfo_alloc);
 
     rb_define_method(Class_KernelInfo, "initialize", KernelInfo_initialize, 1);
-    rb_define_method(Class_KernelInfo, "zero_nans", KernelInfo_zero_nans, 0);
     rb_define_method(Class_KernelInfo, "unity_add", KernelInfo_unity_add, 1);
-    rb_define_method(Class_KernelInfo, "show", KernelInfo_show, 0);
     rb_define_method(Class_KernelInfo, "scale", KernelInfo_scale, 2);
     rb_define_method(Class_KernelInfo, "scale_geometry", KernelInfo_scale_geometry, 1);
     rb_define_method(Class_KernelInfo, "clone", KernelInfo_clone, 0);
@@ -861,9 +845,7 @@ Init_RMagick2(void)
     DEF_CONST(QuantumRange);
     DEF_CONST(MAGICKCORE_QUANTUM_DEPTH);
     DEF_CONSTV(OpaqueAlpha, QuantumRange);
-    DEF_CONST(OpaqueOpacity);
     DEF_CONSTV(TransparentAlpha, 0);
-    DEF_CONST(TransparentOpacity);
 
     version_constants();
     features_constant();
@@ -898,7 +880,6 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedAlphaChannel)
         ENUMERATOR(ActivateAlphaChannel)
         ENUMERATOR(DeactivateAlphaChannel)
-        ENUMERATOR(ResetAlphaChannel)  /* deprecated */
         ENUMERATOR(SetAlphaChannel)
         ENUMERATOR(RemoveAlphaChannel)
         ENUMERATOR(CopyAlphaChannel)
@@ -907,7 +888,6 @@ Init_RMagick2(void)
         ENUMERATOR(ShapeAlphaChannel)
         ENUMERATOR(TransparentAlphaChannel)
         ENUMERATOR(BackgroundAlphaChannel)
-        ENUMERATOR(FlattenAlphaChannel)
 #if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(AssociateAlphaChannel)
         ENUMERATOR(DisassociateAlphaChannel)
@@ -932,7 +912,6 @@ Init_RMagick2(void)
         ENUMERATOR(YellowChannel)
         ENUMERATOR(OpacityChannel)
         ENUMERATOR(BlackChannel)
-        ENUMERATOR(MatteChannel)
         ENUMERATOR(IndexChannel)
         ENUMERATOR(GrayChannel)
         ENUMERATOR(AllChannels)
@@ -969,9 +948,7 @@ Init_RMagick2(void)
         ENUMERATOR(HWBColorspace)
         ENUMERATOR(HSBColorspace)
         ENUMERATOR(LabColorspace)
-        ENUMERATOR(Rec601LumaColorspace)
         ENUMERATOR(Rec601YCbCrColorspace)
-        ENUMERATOR(Rec709LumaColorspace)
         ENUMERATOR(Rec709YCbCrColorspace)
         ENUMERATOR(LogColorspace)
         ENUMERATOR(CMYColorspace)
@@ -1207,7 +1184,6 @@ Init_RMagick2(void)
         ENUMERATOR(SouthWestGravity)
         ENUMERATOR(SouthGravity)
         ENUMERATOR(SouthEastGravity)
-        ENUMERATOR(StaticGravity)
     END_ENUM
 
     // ImageType constants
@@ -1319,12 +1295,10 @@ Init_RMagick2(void)
     DEF_ENUM(PixelInterpolateMethod)
         ENUMERATOR(UndefinedInterpolatePixel)
         ENUMERATOR(AverageInterpolatePixel)
-        ENUMERATOR(BicubicInterpolatePixel)
         ENUMERATOR(BilinearInterpolatePixel)
-        ENUMERATOR(FilterInterpolatePixel)
         ENUMERATOR(IntegerInterpolatePixel)
         ENUMERATOR(MeshInterpolatePixel)
-        ENUMERATOR(NearestNeighborInterpolatePixel)
+        ENUMERATORV(NearestInterpolatePixel, NearestNeighborInterpolatePixel)
         ENUMERATOR(SplineInterpolatePixel)
         ENUMERATOR(Average9InterpolatePixel)
         ENUMERATOR(Average16InterpolatePixel)
@@ -1392,6 +1366,7 @@ Init_RMagick2(void)
         ENUMERATOR(PoissonNoiseQuantumOperator)
         ENUMERATOR(UniformNoiseQuantumOperator)
         ENUMERATOR(CosineQuantumOperator)
+        ENUMERATOR(SetQuantumOperator)
         ENUMERATOR(SineQuantumOperator)
         ENUMERATOR(AddModulusQuantumOperator)
         ENUMERATOR(MeanQuantumOperator)
@@ -1444,7 +1419,6 @@ Init_RMagick2(void)
         ENUMERATOR(CharPixel)
         ENUMERATOR(DoublePixel)
         ENUMERATOR(FloatPixel)
-        ENUMERATOR(IntegerPixel)
         ENUMERATOR(LongPixel)
         ENUMERATOR(QuantumPixel)
         ENUMERATOR(ShortPixel)
@@ -1482,7 +1456,6 @@ Init_RMagick2(void)
         ENUMERATOR(BackgroundVirtualPixelMethod)
         ENUMERATOR(DitherVirtualPixelMethod)
         ENUMERATOR(RandomVirtualPixelMethod)
-        ENUMERATOR(ConstantVirtualPixelMethod)
         ENUMERATOR(MaskVirtualPixelMethod)
         ENUMERATOR(BlackVirtualPixelMethod)
         ENUMERATOR(GrayVirtualPixelMethod)

data/ext/RMagick/rmpixel.c

@@ -127,26 +127,6 @@ Pixel_alpha(VALUE self)
     return C_int_to_R_int(QuantumRange - pixel->opacity);
 }
 
-
-/**
- * Get Pixel opacity attribute.
- *
- * Ruby usage:
- *   - @verbatim Pixel#opacity @endverbatim
- *
- * @param self this object
- * @return the opacity value
- * @deprecated This method has been deprecated. Please use Pixel_alpha.
- */
-VALUE
-Pixel_opacity(VALUE self)
-{
-    Pixel *pixel;
-    rb_warning("Pixel#opacity is deprecated; use Pixel#alpha.");
-    Data_Get_Struct(self, Pixel, pixel);
-    return C_int_to_R_int(pixel->opacity);
-}
-
 /**
  * Set Pixel red attribute.
  *
@@ -226,37 +206,6 @@ Pixel_alpha_eq(VALUE self, VALUE v)
     return QUANTUM2NUM(QuantumRange - pixel->opacity);
 }
 
-
-/**
- * Set Pixel opacity attribute.
- *
- * Ruby usage:
- *   - @verbatim Pixel#opacity= @endverbatim
- *
- * Notes:
- *   - Pixel is Observable. Setters call changed, notify_observers
- *   - Setters return their argument values for backward compatibility to when
- *     Pixel was a Struct class.
- *
- * @param self this object
- * @param v the opacity value
- * @return self
- * @deprecated This method has been deprecated. Please use Pixel_alpha_eq.
- */
-VALUE
-Pixel_opacity_eq(VALUE self, VALUE v)
-{
-    Pixel *pixel;
-
-    rb_warning("Pixel#opacity= is deprecated; use Pixel#alpha=.");
-    rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
-    pixel->opacity = APP2QUANTUM(v);
-    (void) rb_funcall(self, rm_ID_changed, 0);
-    (void) rb_funcall(self, rm_ID_notify_observers, 1, self);
-    return QUANTUM2NUM(pixel->opacity);
-}
-
 /*
  * Get/set Pixel CMYK attributes.
  */
@@ -592,7 +541,6 @@ Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
  *   - 0 <= saturation <= 255 OR "0%" <= saturation <= "100%"
  *   - 0 <= lightness <= 255 OR "0%" <= lightness <= "100%"
  *   - 0 <= alpha <= 1 (0 is transparent, 1 is opaque) OR "0%" <= alpha <= "100%"
- *   - Replaces brain-dead Pixel_from_HSL.
  *
  * @param argc number of input arguments
  * @param argv array of input arguments
@@ -663,42 +611,6 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class ATTRIBUTE_UNUSED)
 }
 
 
-/**
- * Construct an RGB pixel from the array [hue, saturation, luminosity].
- *
- * Ruby usage:
- *   - @verbatim Pixel.from_HSL  @endverbatim
- *
- * @param class the Ruby class to use
- * @param hsl the array
- * @return a new Magick::Pixel object
- * @deprecated This method has been deprecated. Please use Pixel_from_hsla.
- */
-VALUE
-Pixel_from_HSL(VALUE class ATTRIBUTE_UNUSED, VALUE hsl)
-{
-    PixelColor rgb;
-    double hue, saturation, luminosity;
-
-    memset(&rgb, 0, sizeof(rgb));
-
-    hsl = rb_Array(hsl);    // Ensure array
-    if (RARRAY_LEN(hsl) < 3)
-    {
-        rb_raise(rb_eArgError, "array argument must have at least 3 elements");
-    }
-
-    hue        = NUM2DBL(rb_ary_entry(hsl, 0));
-    saturation = NUM2DBL(rb_ary_entry(hsl, 1));
-    luminosity = NUM2DBL(rb_ary_entry(hsl, 2));
-
-    rb_warning("Pixel#from_HSL is deprecated; use from_hsla");
-    ConvertHSLToRGB(hue, saturation, luminosity,
-                 &rgb.red, &rgb.green, &rgb.blue);
-    return Pixel_from_PixelColor(&rgb);
-}
-
-
 /**
  * Create a Magick::Pixel object from a MagickPixel structure.
  *
@@ -799,7 +711,7 @@ Pixel_hash(VALUE self)
     hash  = ScaleQuantumToChar(pixel->red)   << 24;
     hash += ScaleQuantumToChar(pixel->green) << 16;
     hash += ScaleQuantumToChar(pixel->blue)  << 8;
-    hash += ScaleQuantumToChar(pixel->opacity);
+    hash += ScaleQuantumToChar(QuantumRange - pixel->opacity);
 
     return UINT2NUM(hash >> 1);
 }
@@ -999,7 +911,7 @@ Pixel_spaceship(VALUE self, VALUE other)
     }
     else if(this->opacity != that->opacity)
     {
-        return INT2NUM((this->opacity - that->opacity)/abs(this->opacity - that->opacity));
+        return INT2NUM(((QuantumRange - this->opacity) - (QuantumRange - that->opacity))/abs((QuantumRange - this->opacity) - (QuantumRange - that->opacity)));
     }
 
     // Values are equal, check class.
@@ -1017,9 +929,6 @@ Pixel_spaceship(VALUE self, VALUE other)
  * Ruby usage:
  *   - @verbatim Pixel#to_hsla @endverbatim
  *
- * Notes:
- *   - Replace brain-dead Pixel_to_HSL.
- *
  * @param self this object
  * @return an array with hsla data
  * @see Pixel_from_hsla
@@ -1058,36 +967,6 @@ Pixel_to_hsla(VALUE self)
     return hsla;
 }
 
-/**
- * Convert an RGB pixel to the array [hue, saturation, luminosity].
- *
- * Ruby usage:
- *   - @verbatim Pixel#to_HSL @endverbatim
- *
- * @param self this object
- * @return an array with hsl data
- * @deprecated This method has been deprecated. Please use Pixel_to_hsla.
- */
-VALUE
-Pixel_to_HSL(VALUE self)
-{
-    Pixel *pixel;
-    double hue, saturation, luminosity;
-    VALUE hsl;
-
-    Data_Get_Struct(self, Pixel, pixel);
-
-    rb_warning("Pixel#to_HSL is deprecated; use to_hsla");
-    ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &saturation, &luminosity);
-
-    hsl = rb_ary_new3(3, rb_float_new(hue), rb_float_new(saturation),
-                      rb_float_new(luminosity));
-
-    RB_GC_GUARD(hsl);
-
-    return hsl;
-}
-
 
 /**
  * Convert a Pixel to a MagickPixel.
@@ -1239,8 +1118,9 @@ Pixel_to_s(VALUE self)
     char buff[100];
 
     Data_Get_Struct(self, Pixel, pixel);
-    sprintf(buff, "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", opacity=" QuantumFormat
-          , pixel->red, pixel->green, pixel->blue, pixel->opacity);
+    sprintf(buff, "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", alpha=" QuantumFormat,
+            pixel->red, pixel->green, pixel->blue,
+            (QuantumRange - pixel->opacity));
     return rb_str_new2(buff);
 }