ext/RMagick/rmmain.c in rmagick-2.10.0 vs ext/RMagick/rmmain.c in rmagick-2.11.0

- old
+ new

@@ -1,6 +1,6 @@ -/* $Id: rmmain.c,v 1.296 2009/06/19 22:07:05 rmagick Exp $ */ +/* $Id: rmmain.c,v 1.298 2009/07/23 22:55:57 rmagick Exp $ */ /*============================================================================\ | Copyright (C) 2009 by Timothy P. Hunter | Name: rmmain.c | Author: Tim Hunter | Purpose: Contains all module, class, method declarations. @@ -262,10 +262,11 @@ rb_define_method(Class_Image, "auto_orient!", Image_auto_orient_bang, 0); rb_define_method(Class_Image, "properties", Image_properties, 0); rb_define_method(Class_Image, "bilevel_channel", Image_bilevel_channel, -1); rb_define_method(Class_Image, "black_threshold", Image_black_threshold, -1); rb_define_method(Class_Image, "blend", Image_blend, -1); + rb_define_method(Class_Image, "blue_shift", Image_blue_shift, -1); rb_define_method(Class_Image, "blur_image", Image_blur_image, -1); rb_define_method(Class_Image, "blur_channel", Image_blur_channel, -1); rb_define_method(Class_Image, "border", Image_border, 3); rb_define_method(Class_Image, "border!", Image_border_bang, 3); rb_define_method(Class_Image, "change_geometry", Image_change_geometry, 1); @@ -290,10 +291,11 @@ rb_define_method(Class_Image, "composite", Image_composite, -1); rb_define_method(Class_Image, "composite!", Image_composite_bang, -1); rb_define_method(Class_Image, "composite_affine", Image_composite_affine, 2); rb_define_method(Class_Image, "composite_channel", Image_composite_channel, -1); rb_define_method(Class_Image, "composite_channel!", Image_composite_channel_bang, -1); + rb_define_method(Class_Image, "composite_mathematics", Image_composite_mathematics, -1); rb_define_method(Class_Image, "composite_tiled", Image_composite_tiled, -1); rb_define_method(Class_Image, "composite_tiled!", Image_composite_tiled_bang, -1); rb_define_method(Class_Image, "compress_colormap!", Image_compress_colormap_bang, 0); rb_define_method(Class_Image, "contrast", Image_contrast, -1); rb_define_method(Class_Image, "contrast_stretch_channel", Image_contrast_stretch_channel, -1); @@ -975,18 +977,30 @@ ENUMERATOR(ExclusionCompositeOp) ENUMERATOR(HardLightCompositeOp) ENUMERATOR(HueCompositeOp) ENUMERATOR(InCompositeOp) ENUMERATOR(LightenCompositeOp) +#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP) + ENUMERATOR(LinearBurnCompositeOp) +#endif +#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP) + ENUMERATOR(LinearDodgeCompositeOp) +#endif ENUMERATOR(LinearLightCompositeOp) ENUMERATOR(LuminizeCompositeOp) ENUMERATOR(MinusCompositeOp) ENUMERATOR(ModulateCompositeOp) ENUMERATOR(MultiplyCompositeOp) ENUMERATOR(OutCompositeOp) ENUMERATOR(OverCompositeOp) ENUMERATOR(OverlayCompositeOp) +#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP) + ENUMERATOR(PegtopLightCompositeOp) +#endif +#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP) + ENUMERATOR(PinLightCompositeOp) +#endif ENUMERATOR(PlusCompositeOp) ENUMERATOR(ReplaceCompositeOp) // synonym for CopyCompositeOp ENUMERATOR(SaturateCompositeOp) ENUMERATOR(ScreenCompositeOp) ENUMERATOR(SoftLightCompositeOp) @@ -995,10 +1009,13 @@ ENUMERATOR(SrcInCompositeOp) ENUMERATOR(SrcOutCompositeOp) ENUMERATOR(SrcOverCompositeOp) ENUMERATOR(SubtractCompositeOp) ENUMERATOR(ThresholdCompositeOp) +#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP) + ENUMERATOR(VividLightCompositeOp) +#endif ENUMERATOR(XorCompositeOp) END_ENUM // CompressionType constants DEF_ENUM(CompressionType) @@ -1604,10 +1621,10 @@ str = rb_str_new2(Q(RMAGICK_VERSION_STRING)); rb_obj_freeze(str); rb_define_const(Module_Magick, "Version", str); sprintf(long_version, - "This is %s ($Date: 2009/06/19 22:07:05 $) Copyright (C) 2009 by Timothy P. Hunter\n" + "This is %s ($Date: 2009/07/23 22:55:57 $) Copyright (C) 2009 by Timothy P. Hunter\n" "Built with %s\n" "Built for %s\n" "Web page: http://rmagick.rubyforge.org\n" "Email: rmagick@rubyforge.org\n", Q(RMAGICK_VERSION_STRING), mgk_version, Q(RUBY_VERSION_STRING));