ext/RMagick/rmmain.c in rmagick-3.2.0 vs ext/RMagick/rmmain.c in rmagick-4.0.0

- old
+ new

@@ -208,27 +208,24 @@ rb_define_alias(Class_Image, "__display__", "display"); 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); rb_define_singleton_method(Class_Image, "ping", Image_ping, 1); rb_define_singleton_method(Class_Image, "read", Image_read, 1); 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) DCL_ATTR_ACCESSOR(Image, color_profile) DCL_ATTR_READER(Image, colors) @@ -253,22 +250,19 @@ DCL_ATTR_ACCESSOR(Image, gravity) DCL_ATTR_ACCESSOR(Image, image_type) 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) DCL_ATTR_WRITER(Image, monitor) DCL_ATTR_READER(Image, montage) DCL_ATTR_READER(Image, normalized_mean_error) 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) DCL_ATTR_READER(Image, quality) DCL_ATTR_READER(Image, quantum_depth) @@ -410,11 +404,10 @@ rb_define_method(Class_Image, "levelize_channel", Image_levelize_channel, -1); rb_define_method(Class_Image, "linear_stretch", Image_linear_stretch, -1); 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); rb_define_method(Class_Image, "matte_flood_fill", Image_matte_flood_fill, -1); rb_define_method(Class_Image, "median_filter", Image_median_filter, -1); @@ -482,11 +475,10 @@ rb_define_method(Class_Image, "stegano", Image_stegano, 2); rb_define_method(Class_Image, "stereo", Image_stereo, 1); 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); rb_define_method(Class_Image, "thumbnail!", Image_thumbnail_bang, -1); rb_define_method(Class_Image, "tint", Image_tint, -1); @@ -527,12 +519,10 @@ rb_define_method(Class_ImageList, "combine", ImageList_combine, -1); rb_define_method(Class_ImageList, "composite_layers", ImageList_composite_layers, -1); 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); rb_define_method(Class_ImageList, "optimize_layers", ImageList_optimize_layers, 1); rb_define_method(Class_ImageList, "quantize", ImageList_quantize, -1); @@ -635,19 +625,17 @@ // Magick::Pixel has 4 constructors: "new" "from_color", "from_hsla", // 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 DCL_ATTR_ACCESSOR(Pixel, red) 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) DCL_ATTR_ACCESSOR(Pixel, magenta) DCL_ATTR_ACCESSOR(Pixel, yellow) @@ -666,11 +654,10 @@ rb_define_method(Class_Pixel, "hash", Pixel_hash, 0); rb_define_method(Class_Pixel, "intensity", Pixel_intensity, 0); 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); /*-----------------------------------------------------------------------*/ /* Class Magick::ImageList::Montage methods */ @@ -738,11 +725,10 @@ DCL_ATTR_ACCESSOR(Info, fill) DCL_ATTR_ACCESSOR(Info, font) 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) DCL_ATTR_ACCESSOR(Info, matte_color) DCL_ATTR_WRITER(Info, monitor) @@ -773,13 +759,11 @@ Class_KernelInfo = rb_define_class_under(Module_Magick, "KernelInfo", rb_cObject); 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); rb_define_method(Class_KernelInfo, "dup", KernelInfo_clone, 0); @@ -859,13 +843,11 @@ // Miscellaneous fixed-point constants 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(); /*-----------------------------------------------------------------------*/ @@ -896,20 +878,18 @@ // AlphaChannelOption constants DEF_ENUM(AlphaChannelOption) ENUMERATOR(UndefinedAlphaChannel) ENUMERATOR(ActivateAlphaChannel) ENUMERATOR(DeactivateAlphaChannel) - ENUMERATOR(ResetAlphaChannel) /* deprecated */ ENUMERATOR(SetAlphaChannel) ENUMERATOR(RemoveAlphaChannel) ENUMERATOR(CopyAlphaChannel) ENUMERATOR(ExtractAlphaChannel) ENUMERATOR(OpaqueAlphaChannel) ENUMERATOR(ShapeAlphaChannel) ENUMERATOR(TransparentAlphaChannel) ENUMERATOR(BackgroundAlphaChannel) - ENUMERATOR(FlattenAlphaChannel) #if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9) ENUMERATOR(AssociateAlphaChannel) ENUMERATOR(DisassociateAlphaChannel) #endif END_ENUM @@ -930,11 +910,10 @@ ENUMERATOR(MagentaChannel) ENUMERATOR(BlueChannel) ENUMERATOR(YellowChannel) ENUMERATOR(OpacityChannel) ENUMERATOR(BlackChannel) - ENUMERATOR(MatteChannel) ENUMERATOR(IndexChannel) ENUMERATOR(GrayChannel) ENUMERATOR(AllChannels) ENUMERATORV(AlphaChannel, OpacityChannel) ENUMERATORV(DefaultChannels, 0xff & ~OpacityChannel) @@ -967,13 +946,11 @@ ENUMERATORV(SRGBColorspace, sRGBColorspace) ENUMERATOR(HSLColorspace) ENUMERATOR(HWBColorspace) ENUMERATOR(HSBColorspace) ENUMERATOR(LabColorspace) - ENUMERATOR(Rec601LumaColorspace) ENUMERATOR(Rec601YCbCrColorspace) - ENUMERATOR(Rec709LumaColorspace) ENUMERATOR(Rec709YCbCrColorspace) ENUMERATOR(LogColorspace) ENUMERATOR(CMYColorspace) #if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9) ENUMERATOR(LuvColorspace) @@ -1205,11 +1182,10 @@ ENUMERATOR(CenterGravity) ENUMERATOR(EastGravity) ENUMERATOR(SouthWestGravity) ENUMERATOR(SouthGravity) ENUMERATOR(SouthEastGravity) - ENUMERATOR(StaticGravity) END_ENUM // ImageType constants DEF_ENUM(ImageType) ENUMERATOR(UndefinedType) @@ -1317,16 +1293,14 @@ // PixelInterpolateMethod constants 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) ENUMERATOR(BlendInterpolatePixel) ENUMERATOR(BackgroundInterpolatePixel) @@ -1390,10 +1364,11 @@ ENUMERATOR(LaplacianNoiseQuantumOperator) ENUMERATOR(MultiplicativeNoiseQuantumOperator) ENUMERATOR(PoissonNoiseQuantumOperator) ENUMERATOR(UniformNoiseQuantumOperator) ENUMERATOR(CosineQuantumOperator) + ENUMERATOR(SetQuantumOperator) ENUMERATOR(SineQuantumOperator) ENUMERATOR(AddModulusQuantumOperator) ENUMERATOR(MeanQuantumOperator) ENUMERATOR(AbsQuantumOperator) ENUMERATOR(ExponentialQuantumOperator) @@ -1442,11 +1417,10 @@ DEF_ENUM(StorageType) ENUMERATOR(UndefinedPixel) ENUMERATOR(CharPixel) ENUMERATOR(DoublePixel) ENUMERATOR(FloatPixel) - ENUMERATOR(IntegerPixel) ENUMERATOR(LongPixel) ENUMERATOR(QuantumPixel) ENUMERATOR(ShortPixel) END_ENUM @@ -1480,10 +1454,9 @@ ENUMERATOR(TileVirtualPixelMethod) ENUMERATOR(TransparentVirtualPixelMethod) ENUMERATOR(BackgroundVirtualPixelMethod) ENUMERATOR(DitherVirtualPixelMethod) ENUMERATOR(RandomVirtualPixelMethod) - ENUMERATOR(ConstantVirtualPixelMethod) ENUMERATOR(MaskVirtualPixelMethod) ENUMERATOR(BlackVirtualPixelMethod) ENUMERATOR(GrayVirtualPixelMethod) ENUMERATOR(WhiteVirtualPixelMethod) ENUMERATOR(HorizontalTileVirtualPixelMethod)