rmagick 2.8.0 → 2.9.0

data/ext/RMagick/extconf.rb

@@ -1,7 +1,7 @@
 require "mkmf"
 require "date"
 
-RMAGICK_VERS = "2.8.0"
+RMAGICK_VERS = "2.9.0"
 MIN_RUBY_VERS = "1.8.2"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.0"
@@ -287,6 +287,8 @@ end
 have_struct_member("ImageInfo", "profile", headers)   # 6.3.2
 have_struct_member("Image", "tile_offset", headers)   # 6.3.4
 have_struct_member("Image", "type", headers)          # ???
+have_struct_member("DrawInfo", "kerning", headers)    # 6.4.7-8
+have_struct_member("DrawInfo", "interword_spacing", headers)   # 6.4.8-0
 have_type("AlphaChannelType", headers)                # 6.3.5
 have_type("DitherMethod", headers)                    # 6.4.2
 have_type("ImageLayerMethod", headers)                # 6.3.6 replaces MagickLayerMethod
@@ -328,7 +330,21 @@ have_enum_value("InterpolatePixelMethod", "SplineInterpolatePixel", headers) # 6
 have_enum_values("InterlaceType", ["GIFInterlace",                           # 6.3.4
                                   "JPEGInterlace",                           # 6.3.4
                                   "PNGInterlace"], headers)                  # 6.3.4
-have_enum_value("MagickEvaluateOperator", "PowEvaluateOperator", headers)    # 6.4.1-9
+have_enum_values("MagickEvaluateOperator", ["PowEvaluateOperator",           # 6.4.1-9
+                                           "LogEvaluateOperator",            # 6.4.2
+                                           "ThresholdEvaluateOperator",      # 6.4.3
+                                           "ThresholdBlackEvaluateOperator", # 6.4.3
+                                           "ThresholdWhiteEvaluateOperator", # 6.4.3
+                                           "GaussianNoiseEvaluateOperator",  # 6.4.3
+                                           "ImpulseNoiseEvaluateOperator",   # 6.4.3
+                                           "LaplacianNoiseEvaluateOperator", # 6.4.3
+                                           "MultiplicativeNoiseEvaluateOperator", # 6.4.3
+                                           "PoissonNoiseEvaluateOperator",   # 6.4.3
+                                           "UniformNoiseEvaluateOperator",   # 6.4.3
+                                           "CosineEvaluateOperator",         # 6.4.8-5
+                                           "SineEvaluateOperator",           # 6.4.8-5
+                                           "AddModulusEvaluateOperator"],    # 6.4.8-5
+                                                                 headers)
 have_enum_values("MagickLayerMethod", ["OptimizeTransLayer",                 # 6.3.3-4
                                        "RemoveDupsLayer",                    # 6.3.3-6
                                        "RemoveZeroLayer",                    # 6.3.3-6

data/ext/RMagick/rmagick.c

@@ -0,0 +1,312 @@
+/* $Id: rmagick.c,v 1.2 2008/12/27 17:16:03 rmagick Exp $ */
+/*============================================================================\
+|                Copyright (C) 2008 by Timothy P. Hunter
+| Name:     rmagick.c
+| Author:   Tim Hunter
+| Purpose:  Contains Magick module methods.
+\============================================================================*/
+
+
+#include "rmagick.h"
+
+
+
+
+/*
+    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(Import_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, Import_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(Import_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, Import_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.
+*/
+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
+*/
+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.
+*/
+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.
+*/
+VALUE
+Magick_set_log_format(VALUE class, VALUE format)
+{
+    SetLogFormat(StringValuePtr(format));
+    return class;
+}
+

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.260 2008/11/23 15:57:15 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.268 2009/01/12 23:08:35 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -109,7 +109,7 @@
 #define OpenFile rb_io_t
 #endif
 
-// These macros are needed in 1.9.0 but aren't defined prior to 1.8.6.
+// These macros are required in 1.9.1 but aren't defined prior to 1.8.6.
 #if !defined(RSTRING_LEN)
 #define RSTRING_LEN(s) (RSTRING((s))->len)
 #endif
@@ -126,6 +126,20 @@
 #define RARRAY_PTR(a) RARRAY((a))->ptr
 #endif
 
+
+// Convert a C string to a Ruby symbol. Used in marshal_dump/marshal_load methods
+#define CSTR2SYM(s) ID2SYM(rb_intern(s))
+// Convert a C string to a Ruby String, or nil if the ptr is NULL
+#define MAGICK_STRING_TO_OBJ(f) (f) ? rb_str_new2(f) : Qnil
+// Copy the C string in a Ruby String object to ImageMagick memory, or set
+// the pointer to NULL if the object is nil.
+#define OBJ_TO_MAGICK_STRING(f, obj) \
+    if ((obj) != Qnil)\
+        magick_clone_string(&f, RSTRING_PTR(obj));\
+    else\
+        f = NULL;
+
+
 // These two functions are defined in IM starting with 6.3.2.
 #if !defined(HAVE_GETSTRINGINFODATUM)
 #define GetStringInfoDatum(p) (unsigned char *)((p)->datum)
@@ -247,6 +261,45 @@ typedef enum _QuantumExpressionOperator
 #if defined(HAVE_ENUM_POWEVALUATEOPERATOR)
     PowQuantumOperator,
 #endif
+#if defined(HAVE_ENUM_LOGEVALUATEOPERATOR)
+    LogQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_THRESHOLDEVALUATEOPERATOR)
+    ThresholdQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_THRESHOLDBLACKEVALUATEOPERATOR)
+    ThresholdBlackQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_THRESHOLDWHITEEVALUATEOPERATOR)
+    ThresholdWhiteQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_GAUSSIANNOISEEVALUATEOPERATOR)
+    GaussianNoiseQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_IMPULSENOISEEVALUATEOPERATOR)
+    ImpulseNoiseQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_LAPLACIANNOISEEVALUATEOPERATOR)
+    LaplacianNoiseQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_MULTIPLICATIVENOISEEVALUATEOPERATOR)
+    MultiplicativeNoiseQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_POISSONNOISEEVALUATEOPERATOR)
+    PoissonNoiseQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_UNIFORMNOISEEVALUATEOPERATOR)
+    UniformNoiseQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_COSINEEVALUATEOPERATOR)
+    CosineQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_SINEEVALUATEOPERATOR)
+    SineQuantumOperator,
+#endif
+#if defined(HAVE_ENUM_ADDMODULUSEVALUATEOPERATOR)
+    AddModulusQuantumOperator
+#endif
 } QuantumExpressionOperator ;
 
 
@@ -561,10 +614,16 @@ Pixel_##_cmyk_channel_(VALUE self) \
 
 // rmmain.c
 extern void Init_RMagick2(void);
+
+
+// rmagick.c
 extern VALUE Magick_colors(VALUE);
 extern VALUE Magick_fonts(VALUE);
 extern VALUE Magick_init_formats(VALUE);
-
+extern VALUE Magick_limit_resource(int, VALUE *, VALUE);
+extern VALUE Magick_set_cache_threshold(VALUE, VALUE);
+extern VALUE Magick_set_log_event_mask(int, VALUE *, VALUE);
+extern VALUE Magick_set_log_format(VALUE, VALUE);
 
 // rmdraw.c
 ATTR_WRITER(Draw, affine)
@@ -581,6 +640,8 @@ ATTR_WRITER(Draw, font_stretch)
 ATTR_WRITER(Draw, font_style)
 ATTR_WRITER(Draw, font_weight)
 ATTR_WRITER(Draw, gravity)
+ATTR_WRITER(Draw, interword_spacing)
+ATTR_WRITER(Draw, kerning)
 ATTR_WRITER(Draw, pointsize)
 ATTR_WRITER(Draw, rotation)
 ATTR_WRITER(Draw, stroke)
@@ -589,6 +650,7 @@ ATTR_WRITER(Draw, stroke_width)
 ATTR_WRITER(Draw, text_antialias)
 ATTR_WRITER(Draw, tile)
 ATTR_WRITER(Draw, undercolor)
+extern VALUE Draw_alloc(VALUE);
 extern VALUE Draw_annotate(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Draw_clone(VALUE);
 extern VALUE Draw_composite(int, VALUE *, VALUE);
@@ -599,12 +661,21 @@ extern VALUE Draw_get_type_metrics(int, VALUE *, VALUE);
 extern VALUE Draw_init_copy(VALUE, VALUE);
 extern VALUE Draw_initialize(VALUE);
 extern VALUE Draw_inspect(VALUE);
-extern VALUE Draw_alloc(VALUE);
-extern VALUE DrawOptions_alloc(VALUE);
+extern VALUE Draw_marshal_dump(VALUE);
+extern VALUE Draw_marshal_load(VALUE, VALUE);
 extern VALUE Draw_primitive(VALUE, VALUE);
+extern VALUE DrawOptions_alloc(VALUE);
 extern VALUE DrawOptions_initialize(VALUE);
 
 
+extern VALUE PolaroidOptions_alloc(VALUE);
+extern VALUE PolaroidOptions_initialize(VALUE);
+extern VALUE rm_polaroid_new(void);
+ATTR_WRITER(PolaroidOptions, shadow_color);
+ATTR_WRITER(PolaroidOptions, border_color);
+
+
+// rmmontage.c
 ATTR_WRITER(Montage, background_color)
 ATTR_WRITER(Montage, border_color)
 ATTR_WRITER(Montage, border_width)
@@ -627,14 +698,7 @@ extern VALUE Montage_alloc(VALUE);
 extern VALUE rm_montage_new(void);
 
 
-extern VALUE PolaroidOptions_alloc(VALUE);
-extern VALUE PolaroidOptions_initialize(VALUE);
-extern VALUE rm_polaroid_new(void);
-ATTR_WRITER(PolaroidOptions, shadow_color);
-ATTR_WRITER(PolaroidOptions, border_color);
-
-
- // rmilist.c
+// rmilist.c
 extern VALUE ImageList_animate(int, VALUE *, VALUE);
 extern VALUE ImageList_append(VALUE, VALUE);
 extern VALUE ImageList_average(VALUE);
@@ -914,6 +978,8 @@ extern VALUE Image__load(VALUE, VALUE);
 extern VALUE Image_magnify(VALUE);
 extern VALUE Image_magnify_bang(VALUE);
 extern VALUE Image_map(int, VALUE *, VALUE);
+extern VALUE Image_marshal_dump(VALUE);
+extern VALUE Image_marshal_load(VALUE, VALUE);
 extern VALUE Image_mask(int, VALUE *, VALUE);
 extern VALUE Image_matte_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_median_filter(int, VALUE *, VALUE);
@@ -1026,28 +1092,8 @@ extern VALUE  TextureFill_initialize(VALUE, VALUE);
 extern VALUE  TextureFill_fill(VALUE, VALUE);
 
 
-// rmutil.c
-extern VALUE  ChromaticityInfo_to_s(VALUE);
-extern VALUE  ChromaticityInfo_new(ChromaticityInfo *);
-extern void   Color_to_PixelPacket(PixelPacket *, VALUE);
-extern void   Color_to_MagickPixelPacket(Image *, MagickPixelPacket *, VALUE);
-extern VALUE  Color_to_s(VALUE);
-extern VALUE  Color_from_ColorInfo(const ColorInfo *);
-extern VALUE  ClassType_new(ClassType);
-extern VALUE  ColorspaceType_new(ColorspaceType);
-extern VALUE  CompositeOperator_new(CompositeOperator);
-extern VALUE  CompressionType_new(CompressionType);
-extern VALUE  DisposeType_new(DisposeType);
-extern VALUE  EndianType_new(EndianType);
-extern VALUE  FilterTypes_new(FilterTypes);
-extern VALUE  GravityType_new(GravityType);
-extern VALUE  Font_to_s(VALUE);
-extern VALUE  rm_cur_image(VALUE);
-extern VALUE  ImageMagickError_initialize(int, VALUE *, VALUE);
-extern VALUE  ImageType_new(ImageType);
-extern VALUE  InterlaceType_new(InterlaceType);
+// rmpixel.c
 
-extern VALUE   Pixel_alloc(VALUE);
 
 ATTR_ACCESSOR(Pixel, red)
 ATTR_ACCESSOR(Pixel, green)
@@ -1057,6 +1103,8 @@ ATTR_ACCESSOR(Pixel, cyan)
 ATTR_ACCESSOR(Pixel, magenta)
 ATTR_ACCESSOR(Pixel, yellow)
 ATTR_ACCESSOR(Pixel, black)
+extern void   destroy_Pixel(Pixel *);
+extern VALUE  Pixel_alloc(VALUE);
 extern VALUE  Pixel_case_eq(VALUE, VALUE);
 extern VALUE  Pixel_clone(VALUE);
 extern VALUE  Pixel_dup(VALUE);
@@ -1069,59 +1117,87 @@ extern VALUE  Pixel_hash(VALUE);
 extern VALUE  Pixel_initialize(int, VALUE *, VALUE);
 extern VALUE  Pixel_init_copy(VALUE, VALUE);
 extern VALUE  Pixel_intensity(VALUE);
+extern VALUE  Pixel_marshal_dump(VALUE);
+extern VALUE  Pixel_marshal_load(VALUE, VALUE);
 extern VALUE  Pixel_spaceship(VALUE, VALUE);
 extern VALUE  Pixel_to_color(int, VALUE *, VALUE);
 extern VALUE  Pixel_to_HSL(VALUE);
 extern VALUE  Pixel_to_hsla(VALUE);
 extern VALUE  Pixel_to_s(VALUE);
-extern VALUE  PixelPacket_to_Color_Name(Image *, PixelPacket *);
-extern VALUE  PixelPacket_to_Color_Name_Info(Info *, PixelPacket *);
-extern VALUE  Pixel_from_PixelPacket(const PixelPacket *);
 
-extern void   Point_to_PointInfo(PointInfo *, VALUE);
-extern VALUE  PointInfo_to_Point(PointInfo *);
+
+// rmenum.c
+extern VALUE  Enum_alloc(VALUE);
+extern VALUE  Enum_initialize(VALUE, VALUE, VALUE);
+extern VALUE  Enum_to_s(VALUE);
+extern VALUE  Enum_to_i(VALUE);
+extern VALUE  Enum_spaceship(VALUE, VALUE);
+extern VALUE  Enum_case_eq(VALUE, VALUE);
+extern VALUE  Enum_type_initialize(VALUE, VALUE, VALUE);
+extern VALUE  Enum_type_each(VALUE);
+extern VALUE  rm_enum_new(VALUE, VALUE, VALUE);
+
+
+// rmstruct.c
+extern VALUE  ChromaticityInfo_to_s(VALUE);
+extern VALUE  ChromaticityInfo_new(ChromaticityInfo *);
+extern void   Color_to_PixelPacket(PixelPacket *, VALUE);
+extern void   Color_to_MagickPixelPacket(Image *, MagickPixelPacket *, VALUE);
+extern VALUE  Color_to_s(VALUE);
+extern VALUE  Import_ColorInfo(const ColorInfo *);
+extern VALUE  ClassType_new(ClassType);
+extern VALUE  ColorspaceType_new(ColorspaceType);
+extern VALUE  CompositeOperator_new(CompositeOperator);
+extern VALUE  CompressionType_new(CompressionType);
+extern VALUE  DisposeType_new(DisposeType);
+extern VALUE  EndianType_new(EndianType);
+extern VALUE  FilterTypes_new(FilterTypes);
+extern VALUE  GravityType_new(GravityType);
+extern VALUE  Font_to_s(VALUE);
+extern VALUE  ImageType_new(ImageType);
+extern VALUE  InterlaceType_new(InterlaceType);
+extern VALUE  Pixel_from_MagickPixelPacket(const MagickPixelPacket *);
+extern VALUE  Pixel_from_PixelPacket(const PixelPacket *);
+extern void   Export_PointInfo(PointInfo *, VALUE);
+extern VALUE  Import_PointInfo(PointInfo *);
 extern VALUE  PrimaryInfo_to_s(VALUE);
-extern VALUE  PrimaryInfo_from_PrimaryInfo(PrimaryInfo *);
+extern VALUE  Import_PrimaryInfo(PrimaryInfo *);
 extern VALUE  RectangleInfo_to_s(VALUE);
-extern VALUE  Rectangle_from_RectangleInfo(RectangleInfo *);
+extern VALUE  Import_RectangleInfo(RectangleInfo *);
 extern VALUE  RenderingIntent_new(RenderingIntent);
 extern VALUE  ResolutionType_new(ResolutionType);
 extern VALUE  SegmentInfo_to_s(VALUE);
-extern VALUE  Segment_from_SegmentInfo(SegmentInfo *);
-extern void   AffineMatrix_to_AffineMatrix(AffineMatrix *, VALUE);
-extern void   ChromaticityInfo_to_ChromaticityInfo(ChromaticityInfo *, VALUE);
-extern void   Color_to_ColorInfo(ColorInfo *, VALUE);
+extern VALUE  Import_SegmentInfo(SegmentInfo *);
+extern void   Export_AffineMatrix(AffineMatrix *, VALUE);
+extern VALUE  Import_AffineMatrix(AffineMatrix *);
+extern void   Export_ChromaticityInfo(ChromaticityInfo *, VALUE);
+extern void   Export_ColorInfo(ColorInfo *, VALUE);
 extern VALUE  InterpolatePixelMethod_new(InterpolatePixelMethod);
 extern VALUE  OrientationType_new(OrientationType);
-extern void   PrimaryInfo_to_PrimaryInfo(PrimaryInfo *, VALUE);
-extern void   Rectangle_to_RectangleInfo(RectangleInfo *, VALUE);
-extern void   Segment_to_SegmentInfo(SegmentInfo *, VALUE);
+extern void   Export_PrimaryInfo(PrimaryInfo *, VALUE);
+extern void   Export_RectangleInfo(RectangleInfo *, VALUE);
+extern void   Export_SegmentInfo(SegmentInfo *, VALUE);
 extern void   Font_to_TypeInfo(TypeInfo *, VALUE);
-extern void   TypeMetric_to_TypeMetric(TypeMetric *, VALUE);
-extern VALUE  Font_from_TypeInfo(const TypeInfo *);
+extern void   Export_TypeMetric(TypeMetric *, VALUE);
+extern VALUE  Import_TypeInfo(const TypeInfo *);
 extern VALUE  TypeMetric_to_s(VALUE);
-extern VALUE  TypeMetric_from_TypeMetric(TypeMetric *);
+extern VALUE  Import_TypeMetric(TypeMetric *);
 extern const char *StorageType_name(StorageType);
 extern VALUE  VirtualPixelMethod_new(VirtualPixelMethod);
 extern VALUE  LAYERMETHODTYPE_NEW(LAYERMETHODTYPE);
 
-extern VALUE  Enum_alloc(VALUE);
-extern VALUE  Enum_initialize(VALUE, VALUE, VALUE);
-extern VALUE  Enum_to_s(VALUE);
-extern VALUE  Enum_to_i(VALUE);
-extern VALUE  Enum_spaceship(VALUE, VALUE);
-extern VALUE  Enum_case_eq(VALUE, VALUE);
-extern VALUE  Enum_type_initialize(VALUE, VALUE, VALUE);
-extern VALUE  Enum_type_each(VALUE);
-
 
+// rmutil.c
+extern VALUE  ImageMagickError_initialize(int, VALUE *, VALUE);
 extern void  *magick_malloc(const size_t);
 extern void  *magick_safe_malloc(const size_t, const size_t);
 extern void   magick_free(void *);
 extern void  *magick_realloc(void *, const size_t);
 extern void  *magick_safe_realloc(void *, const size_t, const size_t);
 extern void   magick_clone_string(char **, const char *);
-extern VALUE  rm_enum_new(VALUE, VALUE, VALUE);
+extern VALUE  rm_cur_image(VALUE);
+extern VALUE  rm_pixelpacket_to_color_name(Image *, PixelPacket *);
+extern VALUE  rm_pixelpacket_to_color_name_info(Info *, PixelPacket *);
 extern VALUE  rm_no_freeze(VALUE);
 extern int    rm_strcasecmp(const char *, const char *);
 extern int    rm_strncasecmp(const char *, const char *, size_t);