rmmain.c in rmagick-2.7.0

- old
+ new

@@ -1,6 +1,6 @@
-/* $Id: rmmain.c,v 1.266 2008/08/31 20:00:39 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.271 2008/09/28 00:23:10 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
 | Author:   Tim Hunter
 | Purpose:  Contains all module, class, method declarations.
@@ -479,11 +479,11 @@
     rb_define_method(Class_Image, "add_compose_mask", Image_add_compose_mask, 1);
     rb_define_method(Class_Image, "add_noise", Image_add_noise, 1);
     rb_define_method(Class_Image, "add_noise_channel", Image_add_noise_channel, -1);
     rb_define_method(Class_Image, "add_profile", Image_add_profile, 1);
     rb_define_method(Class_Image, "affine_transform", Image_affine_transform, 1);
-    rb_define_method(Class_Image, "affinity", Image_affinity, -1);
+    rb_define_method(Class_Image, "remap", Image_remap, -1);
     rb_define_method(Class_Image, "alpha", Image_alpha, -1);
     rb_define_method(Class_Image, "alpha?", Image_alpha_q, 0);
     rb_define_method(Class_Image, "[]", Image_aref, 1);
     rb_define_method(Class_Image, "[]=", Image_aset, 2);
     rb_define_method(Class_Image, "auto_orient", Image_auto_orient, 0);
@@ -686,11 +686,11 @@
 
     Class_ImageList = rb_define_class_under(Module_Magick, "ImageList", rb_cObject);
 
     // Define an alias for Object#display before we override it
     rb_define_alias(Class_ImageList, "__display__", "display");
-    rb_define_method(Class_ImageList, "affinity", ImageList_affinity, -1);
+    rb_define_method(Class_ImageList, "remap", ImageList_remap, -1);
     rb_define_method(Class_ImageList, "animate", ImageList_animate, -1);
     rb_define_method(Class_ImageList, "append", ImageList_append, 1);
     rb_define_method(Class_ImageList, "average", ImageList_average, 0);
     rb_define_method(Class_ImageList, "coalesce", ImageList_coalesce, 0);
     rb_define_method(Class_ImageList, "composite_layers", ImageList_composite_layers, -1);
@@ -1030,12 +1030,19 @@
 #if defined(HAVE_TYPE_ALPHACHANNELTYPE)
     DEF_ENUM(AlphaChannelType)
         ENUMERATOR(UndefinedAlphaChannel)
         ENUMERATOR(ActivateAlphaChannel)
         ENUMERATOR(DeactivateAlphaChannel)
-        ENUMERATOR(ResetAlphaChannel)
+        ENUMERATOR(ResetAlphaChannel)  /* deprecated */
         ENUMERATOR(SetAlphaChannel)
+#if defined(HAVE_ENUM_COPYALPHACHANNEL)
+        ENUMERATOR(CopyAlphaChannel)
+        ENUMERATOR(ExtractAlphaChannel)
+        ENUMERATOR(OpaqueAlphaChannel)
+        ENUMERATOR(ShapeAlphaChannel)
+        ENUMERATOR(TransparentAlphaChannel)
+#endif
     END_ENUM
 #endif
 
     // AnchorType constants (for Draw#text_anchor - these are not defined by ImageMagick)
     DEF_ENUM(AnchorType)
@@ -1275,17 +1282,22 @@
 #endif
         ENUMERATOR(ScaleRotateTranslateDistortion)
 #if defined(HAVE_ENUM_SHEPARDSDISTORTION)
         ENUMERATOR(ShepardsDistortion)
 #endif
+#if defined(HAVE_ENUM_BARRELINVERSEDISTORTION)
+        ENUMERATOR(BarrelInverseDistortion)
+#endif
     END_ENUM
 #endif
 
 #if defined(HAVE_TYPE_DITHERMETHOD)
     DEF_ENUM(DitherMethod)
         ENUMERATOR(UndefinedDitherMethod)
+#if defined(HAVE_ENUM_NODITHERMETHOD)
         ENUMERATOR(NoDitherMethod)
+#endif
         ENUMERATOR(RiemersmaDitherMethod)
         ENUMERATOR(FloydSteinbergDitherMethod)
     END_ENUM
 #endif
 
@@ -1432,10 +1444,13 @@
         ENUMERATOR(MosaicLayer)
 #endif
 #if defined(HAVE_ENUM_FLATTENLAYER)
         ENUMERATOR(FlattenLayer)
 #endif
+#if defined(HAVE_ENUM_TRIMBOUNDSLAYER)
+        ENUMERATOR(TrimBoundsLayer)
+#endif
     END_ENUM
 
     DEF_ENUM(MetricType)
         ENUMERATOR(UndefinedMetric)
         ENUMERATOR(AbsoluteErrorMetric)
@@ -1766,10 +1781,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: 2008/08/31 20:00:39 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/09/28 00:23:10 $) Copyright (C) 2008 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));