rmagick 2.8.0 → 2.9.0

data/ext/RMagick/rmimage.c

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.334 2008/12/04 23:50:23 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.343 2009/01/12 23:08:35 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -584,7 +584,7 @@ Image_affine_transform(VALUE self, VALUE affine)
     image = rm_check_destroyed(self);
 
     // Convert Magick::AffineMatrix to AffineMatrix structure.
-    AffineMatrix_to_AffineMatrix(&matrix, affine);
+    Export_AffineMatrix(&matrix, affine);
 
     GetExceptionInfo(&exception);
     new_image = AffineTransformImage(image, &matrix, &exception);
@@ -829,7 +829,7 @@ VALUE
 Image_background_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return PixelPacket_to_Color_Name(image, &image->background_color);
+    return rm_pixelpacket_to_color_name(image, &image->background_color);
 }
 
 
@@ -1438,7 +1438,7 @@ VALUE
 Image_border_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return PixelPacket_to_Color_Name(image, &image->border_color);
+    return rm_pixelpacket_to_color_name(image, &image->border_color);
 }
 
 
@@ -1473,7 +1473,7 @@ Image_bounding_box(VALUE self)
 
     (void) DestroyExceptionInfo(&exception);
 
-    return Rectangle_from_RectangleInfo(&box);
+    return Import_RectangleInfo(&box);
 }
 
 
@@ -1787,7 +1787,7 @@ VALUE
 Image_chromaticity_eq(VALUE self, VALUE chroma)
 {
     Image *image = rm_check_frozen(self);
-    ChromaticityInfo_to_ChromaticityInfo(&image->chromaticity, chroma);
+    Export_ChromaticityInfo(&image->chromaticity, chroma);
     return self;
 }
 
@@ -2217,7 +2217,7 @@ Image_colormap(int argc, VALUE *argv, VALUE self)
         {
             rb_raise(rb_eIndexError, "index out of range");
         }
-        return PixelPacket_to_Color_Name(image, &image->colormap[idx]);
+        return rm_pixelpacket_to_color_name(image, &image->colormap[idx]);
     }
 
     // This is a "set" operation. Things are different.
@@ -2257,7 +2257,7 @@ Image_colormap(int argc, VALUE *argv, VALUE self)
     color = image->colormap[idx];
     image->colormap[idx] = new_color;
 
-    return PixelPacket_to_Color_Name(image, &color);
+    return rm_pixelpacket_to_color_name(image, &color);
 }
 
 DEF_ATTR_READER(Image, colors, ulong)
@@ -2661,7 +2661,7 @@ Image_composite_affine(VALUE self, VALUE source, VALUE affine_matrix)
     composite_image = rm_check_destroyed(source);
     new_image = rm_clone_image(image);
 
-    AffineMatrix_to_AffineMatrix(&affine, affine_matrix);
+    Export_AffineMatrix(&affine, affine_matrix);
     (void) DrawAffineImage(new_image, composite_image, &affine);
     rm_check_image_exception(new_image, DestroyOnError);
 
@@ -4051,7 +4051,9 @@ Image__dump(VALUE self, VALUE depth)
 
     // Concatenate the blob onto the header & return the result
     str = rb_str_new((char *)&mi, (long)(mi.len+offsetof(DumpedImage,magick)));
-    return rb_str_cat(str, (char *)blob, (long)length);
+    str = rb_str_buf_cat(str, (char *)blob, (long)length);
+    magick_free((void*)blob);
+    return str;
 }
 
 
@@ -4702,7 +4704,7 @@ VALUE
 Image_extract_info(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return Rectangle_from_RectangleInfo(&image->extract_info);
+    return Import_RectangleInfo(&image->extract_info);
 }
 
 
@@ -4710,7 +4712,7 @@ VALUE
 Image_extract_info_eq(VALUE self, VALUE rect)
 {
     Image *image = rm_check_frozen(self);
-    Rectangle_to_RectangleInfo(&image->extract_info, rect);
+    Export_RectangleInfo(&image->extract_info, rect);
     return self;
 }
 
@@ -6255,6 +6257,94 @@ Image_map(int argc, VALUE *argv, VALUE self)
 }
 
 
+/*
+    Method:     Image#marshal_dump
+    Purpose:    Support Marshal.dump >= 1.8
+    Returns:    [img.filename, img.to_blob]
+*/
+VALUE
+Image_marshal_dump(VALUE self)
+{
+    Image *image;
+    Info *info;
+    unsigned char *blob;
+    size_t length;
+    VALUE ary;
+    ExceptionInfo exception;
+
+    image = rm_check_destroyed(self);
+
+    info = CloneImageInfo(NULL);
+    if (!info)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
+    }
+
+    ary = rb_ary_new2(2);
+    if (image->filename)
+    {
+        rb_ary_store(ary, 0, rb_str_new2(image->filename));
+    }
+    else
+    {
+        rb_ary_store(ary, 0, Qnil);
+    }
+
+    GetExceptionInfo(&exception);
+    blob = ImageToBlob(info, image, &length, &exception);
+
+    // Destroy info before raising an exception
+    DestroyImageInfo(info);
+    CHECK_EXCEPTION()
+    (void) DestroyExceptionInfo(&exception);
+
+    rb_ary_store(ary, 1, rb_str_new((char *)blob, (long)length));
+    magick_free((void*)blob);
+
+    return ary;
+}
+
+
+/*
+    Method:     Image#marshal_load
+    Purpose:    Support Marshal.load >= 1.8
+    Notes:      On entry, ary is the array returned from marshal_dump.
+*/
+VALUE
+Image_marshal_load(VALUE self, VALUE ary)
+{
+    VALUE blob, filename;
+    Info *info;
+    Image *image;
+    ExceptionInfo exception;
+
+    info = CloneImageInfo(NULL);
+    if (!info)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
+    }
+
+    filename = rb_ary_shift(ary);
+    blob = rb_ary_shift(ary);
+
+    GetExceptionInfo(&exception);
+    if (filename != Qnil)
+    {
+        strcpy(info->filename, RSTRING_PTR(filename));
+    }
+    image = BlobToImage(info, RSTRING_PTR(blob), RSTRING_LEN(blob), &exception);
+
+    // Destroy info before raising an exception
+    DestroyImageInfo(info);
+    CHECK_EXCEPTION();
+    (void) DestroyExceptionInfo(&exception);
+
+    UPDATE_DATA_PTR(self, image);
+
+    return self;
+}
+
+
 /*
     Static:     get_image_mask
     Purpose:    Return the image's clip mask, or nil if it doesn't have a clip
@@ -6441,7 +6531,7 @@ VALUE
 Image_matte_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return PixelPacket_to_Color_Name(image, &image->matte_color);
+    return rm_pixelpacket_to_color_name(image, &image->matte_color);
 }
 
 /*
@@ -7281,7 +7371,7 @@ VALUE
 Image_page(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return Rectangle_from_RectangleInfo(&image->page);
+    return Import_RectangleInfo(&image->page);
 }
 
 
@@ -7293,7 +7383,7 @@ VALUE
 Image_page_eq(VALUE self, VALUE rect)
 {
     Image *image = rm_check_frozen(self);
-    Rectangle_to_RectangleInfo(&image->page, rect);
+    Export_RectangleInfo(&image->page, rect);
     return self;
 }
 
@@ -7763,6 +7853,71 @@ Image_quantum_operator(int argc, VALUE *argv, VALUE self)
         case PowQuantumOperator:
             qop = PowEvaluateOperator;
             break;
+#endif
+#if defined(HAVE_ENUM_LOGEVALUATEOPERATOR)
+        case LogQuantumOperator:
+            qop = LogEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_THRESHOLDEVALUATEOPERATOR)
+        case ThresholdQuantumOperator:
+            qop = ThresholdEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_THRESHOLDBLACKEVALUATEOPERATOR)
+        case ThresholdBlackQuantumOperator:
+            qop = ThresholdBlackEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_THRESHOLDWHITEEVALUATEOPERATOR)
+        case ThresholdWhiteQuantumOperator:
+            qop = ThresholdWhiteEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_GAUSSIANNOISEEVALUATEOPERATOR)
+        case GaussianNoiseQuantumOperator:
+            qop = GaussianNoiseEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_IMPULSENOISEEVALUATEOPERATOR)
+        case ImpulseNoiseQuantumOperator:
+            qop = ImpulseNoiseEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_LAPLACIANNOISEEVALUATEOPERATOR)
+        case LaplacianNoiseQuantumOperator:
+            qop = LaplacianNoiseEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_MULTIPLICATIVENOISEEVALUATEOPERATOR)
+        case MultiplicativeNoiseQuantumOperator:
+            qop = MultiplicativeNoiseEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_POISSONNOISEEVALUATEOPERATOR)
+        case PoissonNoiseQuantumOperator:
+            qop = PoissonNoiseEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_UNIFORMNOISEEVALUATEOPERATOR)
+        case UniformNoiseQuantumOperator:
+            qop = UniformNoiseEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_COSINEEVALUATEOPERATOR)
+        case CosineQuantumOperator:
+            qop = CosineEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_SINEEVALUATEOPERATOR)
+        case SineQuantumOperator:
+            qop = SineEvaluateOperator;
+            break;
+#endif
+#if defined(HAVE_ENUM_ADDMODULUSEVALUATEOPERATOR)
+        case AddModulusQuantumOperator:
+            qop = AddModulusEvaluateOperator;
+            break;
 #endif
     }
 
@@ -10262,6 +10417,7 @@ Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
     return rm_image_new(new_image);
 #else
     rm_not_implemented();
+    return (VALUE)0;
     argc = argc;
     argv = argv;
     self = self;
@@ -10277,7 +10433,7 @@ VALUE
 Image_transparent_color(VALUE self)
 {
     Image *image = rm_check_destroyed(self);
-    return PixelPacket_to_Color_Name(image, &image->transparent_color);
+    return rm_pixelpacket_to_color_name(image, &image->transparent_color);
 }
 
 

data/ext/RMagick/rminfo.c

@@ -1,4 +1,4 @@
-/* $Id: rminfo.c,v 1.74 2008/11/15 21:30:50 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.75 2009/01/01 23:36:00 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rminfo.c
@@ -380,7 +380,7 @@ Info_background_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return PixelPacket_to_Color_Name_Info(info, &info->background_color);
+    return rm_pixelpacket_to_color_name_info(info, &info->background_color);
 }
 
 
@@ -412,7 +412,7 @@ Info_border_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return PixelPacket_to_Color_Name_Info(info, &info->border_color);
+    return rm_pixelpacket_to_color_name_info(info, &info->border_color);
 }
 
 /*
@@ -1256,7 +1256,7 @@ Info_matte_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return PixelPacket_to_Color_Name_Info(info, &info->matte_color);
+    return rm_pixelpacket_to_color_name_info(info, &info->matte_color);
 }
 
 /*
@@ -1703,7 +1703,7 @@ Info_transparent_color(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return PixelPacket_to_Color_Name_Info(info, &info->transparent_color);
+    return rm_pixelpacket_to_color_name_info(info, &info->transparent_color);
 }
 
 

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.280 2008/12/02 22:57:42 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.285 2009/01/12 23:08:35 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -21,306 +21,6 @@ static void test_Magick_version(void);
 static void version_constants(void);
 
 
-
-/*
-    Method:     Magick::colors [ { |colorinfo| } ]
-    Purpose:    If called with the optional block, iterates over the colors,
-                otherwise returns an array of Magick::Color objects
-    Notes:      There are 3 implementations
-
-*/
-VALUE
-Magick_colors(VALUE class)
-{
-    const ColorInfo **color_info_list;
-    unsigned long number_colors, x;
-    volatile VALUE ary;
-    ExceptionInfo exception;
-
-    GetExceptionInfo(&exception);
-
-    color_info_list = GetColorInfoList("*", &number_colors, &exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
-
-
-    if (rb_block_given_p())
-    {
-        for (x = 0; x < number_colors; x++)
-        {
-            (void) rb_yield(Color_from_ColorInfo(color_info_list[x]));
-        }
-        magick_free((void *)color_info_list);
-        return class;
-    }
-    else
-    {
-        ary = rb_ary_new2((long) number_colors);
-        for (x = 0; x < number_colors; x++)
-        {
-            (void) rb_ary_push(ary, Color_from_ColorInfo(color_info_list[x]));
-        }
-
-        magick_free((void *)color_info_list);
-        return ary;
-    }
-}
-
-
-/*
-  Method:   Magick::fonts [ { |fontinfo| } ]
-  Purpose:  If called with the optional block, iterates over the fonts,
-            otherwise returns an array of Magick::Font objects
-*/
-VALUE
-Magick_fonts(VALUE class)
-{
-    const TypeInfo **type_info;
-    unsigned long number_types, x;
-    volatile VALUE ary;
-    ExceptionInfo exception;
-
-    GetExceptionInfo(&exception);
-    type_info = GetTypeInfoList("*", &number_types, &exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
-
-    if (rb_block_given_p())
-    {
-        for (x = 0; x < number_types; x++)
-        {
-            (void) rb_yield(Font_from_TypeInfo((const TypeInfo *)type_info[x]));
-        }
-        magick_free((void *)type_info);
-        return class;
-    }
-    else
-    {
-        ary = rb_ary_new2((long)number_types);
-        for (x = 0; x < number_types; x++)
-        {
-            (void) rb_ary_push(ary, Font_from_TypeInfo((const TypeInfo *)type_info[x]));
-        }
-        magick_free((void *)type_info);
-        return ary;
-    }
-
-}
-
-
-/*
-  Method:   Magick.init_formats
-  Purpose:  Build the @@formats hash
-
-            The hash keys are image formats. The hash values
-            specify the format "mode string", i.e. a description of what
-            ImageMagick can do with that format. The mode string is in the
-            form "BRWA", where
-                "B" is "*" if the format has native blob support, or " " otherwise.
-                "R" is "r" if ImageMagick can read that format, or "-" otherwise.
-                "W" is "w" if ImageMagick can write that format, or "-" otherwise.
-                "A" is "+" if the format supports multi-image files, or "-" otherwise.
-  Notes:    Only called once.
-            There are 3 implementations.
-*/
-
-static VALUE
-MagickInfo_to_format(const MagickInfo *magick_info)
-{
-    char mode[4];
-
-    mode[0] = magick_info->blob_support ? '*': ' ';
-    mode[1] = magick_info->decoder ? 'r' : '-';
-    mode[2] = magick_info->encoder ? 'w' : '-';
-    mode[3] = magick_info->encoder && magick_info->adjoin ? '+' : '-';
-
-    return rb_str_new(mode, sizeof(mode));
-}
-
-
-VALUE
-Magick_init_formats(VALUE class)
-{
-    const MagickInfo **magick_info;
-    unsigned long number_formats, x;
-    volatile VALUE formats;
-    ExceptionInfo exception;
-
-    class = class;      // defeat "never referenced" message from icc
-    formats = rb_hash_new();
-
-    // IM 6.1.3 added an exception argument to GetMagickInfoList
-    GetExceptionInfo(&exception);
-    magick_info = GetMagickInfoList("*", &number_formats, &exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
-
-
-    for (x = 0; x < number_formats; x++)
-    {
-        (void) rb_hash_aset(formats
-                            , rb_str_new2(magick_info[x]->name)
-                            , MagickInfo_to_format((const MagickInfo *)magick_info[x]));
-    }
-    return formats;
-}
-
-
-/*
-  Method:   Magick.limit_resource(resource[, limit])
-  Purpose:  Get/set resource limits. If a limit is specified the old limit
-            is set to the new value. Either way the current/old limit is returned.
-*/
-static VALUE
-Magick_limit_resource(int argc, VALUE *argv, VALUE class)
-{
-    volatile VALUE resource, limit;
-    ResourceType res = UndefinedResource;
-    char *str;
-    ID id;
-    unsigned long cur_limit;
-
-    rb_scan_args(argc, argv, "11", &resource, &limit);
-
-    switch (TYPE(resource))
-    {
-        case T_NIL:
-            return class;
-
-        case T_SYMBOL:
-            id = (ID)SYM2ID(resource);
-            if (id == rb_intern("area"))
-            {
-                res = AreaResource;
-            }
-            else if (id == rb_intern("memory"))
-            {
-                res = MemoryResource;
-            }
-            else if (id == rb_intern("map"))
-            {
-                res = MapResource;
-            }
-            else if (id == rb_intern("disk"))
-            {
-                res = DiskResource;
-            }
-            else if (id == rb_intern("file"))
-            {
-                res = FileResource;
-            }
-            else
-            {
-                rb_raise(rb_eArgError, "unknown resource: `:%s'", rb_id2name(id));
-            }
-            break;
-
-        default:
-            str = StringValuePtr(resource);
-            if (*str == '\0')
-            {
-                return class;
-            }
-            else if (rm_strcasecmp("area", str) == 0)
-            {
-                res = AreaResource;
-            }
-            else if (rm_strcasecmp("memory", str) == 0)
-            {
-                res = MemoryResource;
-            }
-            else if (rm_strcasecmp("map", str) == 0)
-            {
-                res = MapResource;
-            }
-            else if (rm_strcasecmp("disk", str) == 0)
-            {
-                res = DiskResource;
-            }
-            else if (rm_strcasecmp("file", str) == 0)
-            {
-                res = FileResource;
-            }
-            else
-            {
-                rb_raise(rb_eArgError, "unknown resource: `%s'", str);
-            }
-            break;
-    }
-
-    cur_limit = GetMagickResourceLimit(res);
-
-    if (argc > 1)
-    {
-        (void) SetMagickResourceLimit(res, (MagickSizeType)NUM2ULONG(limit));
-    }
-
-    return ULONG2NUM(cur_limit);
-}
-
-
-/*
-    Method      Magick.set_cache_threshold(megabytes)
-    Purpose:    sets the amount of free memory allocated for the
-                pixel cache.  Once this threshold is exceeded, all
-                subsequent pixels cache operations are to/from disk.
-    Notes:      singleton method
-*/
-static VALUE
-Magick_set_cache_threshold(VALUE class, VALUE threshold)
-{
-    unsigned long thrshld = NUM2ULONG(threshold);
-    (void) SetMagickResourceLimit(MemoryResource, (MagickSizeType)thrshld);
-    (void) SetMagickResourceLimit(MapResource, (MagickSizeType)(2*thrshld));
-    return class;
-}
-
-
-/*
-    Method:     Magick.set_log_event_mask(event,...) -> Magick
-    Notes:      "event" is one of "all", "annotate", "blob", "cache",
-                "coder", "configure", "deprecate", "locale", "none",
-                "render", "transform", "user", "x11". Multiple events
-                can be specified. Event names may be capitalized.
-*/
-static VALUE
-Magick_set_log_event_mask(int argc, VALUE *argv, VALUE class)
-{
-    int x;
-
-    if (argc == 0)
-    {
-        rb_raise(rb_eArgError, "wrong number of arguments (at least 1 required)");
-    }
-    for (x = 0; x < argc; x++)
-    {
-        (void) SetLogEventMask(StringValuePtr(argv[x]));
-    }
-    return class;
-}
-
-/*
-    Method:     Magick.set_log_format(format) -> Magick
-    Notes:      Format is a string containing one or more of:
-                %t  - current time
-                %r  - elapsed time
-                %u  - user time
-                %p  - pid
-                %m  - module (source file name)
-                %f  - function name
-                %l  - line number
-                %d  - event domain (one of the events listed above)
-                %e  - event name
-                Plus other characters, including \n, etc.
-*/
-static VALUE
-Magick_set_log_format(VALUE class, VALUE format)
-{
-    SetLogFormat(StringValuePtr(format));
-    return class;
-}
-
-
 /*
   External:     Init_RMagick2
   Purpose:      define the classes and constants
@@ -589,6 +289,8 @@ Init_RMagick2(void)
     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, 5);
     rb_define_method(Class_Image, "median_filter", Image_median_filter, -1);
@@ -729,6 +431,8 @@ Init_RMagick2(void)
     DCL_ATTR_WRITER(Draw, font_style)
     DCL_ATTR_WRITER(Draw, font_weight)
     DCL_ATTR_WRITER(Draw, gravity)
+    DCL_ATTR_WRITER(Draw, interword_spacing)
+    DCL_ATTR_WRITER(Draw, kerning)
     DCL_ATTR_WRITER(Draw, pointsize)
     DCL_ATTR_WRITER(Draw, rotation)
     DCL_ATTR_WRITER(Draw, stroke)
@@ -748,6 +452,8 @@ Init_RMagick2(void)
     rb_define_method(Class_Draw, "initialize", Draw_initialize, 0);
     rb_define_method(Class_Draw, "initialize_copy", Draw_init_copy, 1);
     rb_define_method(Class_Draw, "inspect", Draw_inspect, 0);
+    rb_define_method(Class_Draw, "marshal_dump", Draw_marshal_dump, 0);
+    rb_define_method(Class_Draw, "marshal_load", Draw_marshal_load, 1);
     rb_define_method(Class_Draw, "primitive", Draw_primitive, 1);
 
     /*-----------------------------------------------------------------------*/
@@ -829,6 +535,8 @@ Init_RMagick2(void)
     rb_define_method(Class_Pixel, "fcmp", Pixel_fcmp, -1);
     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);
@@ -1555,6 +1263,45 @@ Init_RMagick2(void)
         ENUMERATOR(XorQuantumOperator)
 #if defined(HAVE_ENUM_POWEVALUATEOPERATOR)
         ENUMERATOR(PowQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_LOGEVALUATEOPERATOR)
+        ENUMERATOR(LogQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_THRESHOLDEVALUATEOPERATOR)
+        ENUMERATOR(ThresholdQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_THRESHOLDBLACKEVALUATEOPERATOR)
+        ENUMERATOR(ThresholdBlackQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_THRESHOLDWHITEEVALUATEOPERATOR)
+        ENUMERATOR(ThresholdWhiteQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_GAUSSIANNOISEEVALUATEOPERATOR)
+        ENUMERATOR(GaussianNoiseQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_IMPULSENOISEEVALUATEOPERATOR)
+        ENUMERATOR(ImpulseNoiseQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_LAPLACIANNOISEEVALUATEOPERATOR)
+        ENUMERATOR(LaplacianNoiseQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_MULTIPLICATIVENOISEEVALUATEOPERATOR)
+        ENUMERATOR(MultiplicativeNoiseQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_POISSONNOISEEVALUATEOPERATOR)
+        ENUMERATOR(PoissonNoiseQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_UNIFORMNOISEEVALUATEOPERATOR)
+        ENUMERATOR(UniformNoiseQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_COSINEEVALUATEOPERATOR)
+        ENUMERATOR(CosineQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_SINEEVALUATEOPERATOR)
+        ENUMERATOR(SineQuantumOperator)
+#endif
+#if defined(HAVE_ENUM_ADDMODULUSEVALUATEOPERATOR)
+        ENUMERATOR(AddModulusQuantumOperator)
 #endif
     END_ENUM
 
@@ -1780,7 +1527,7 @@ test_Magick_version(void)
         }
 
         rb_raise(rb_eRuntimeError,
-                 "This version of RMagick was configured with %s %s but %.*s is in use.\n" ,
+                 "This installation of RMagick was configured with %s %s but %.*s is in use.\n" ,
                  MagickPackageName, MagickLibVersionText, x, version_str);
     }
 
@@ -1812,7 +1559,7 @@ version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2008/12/02 22:57:42 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2009/01/12 23:08:35 $) Copyright (C) 2008 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"