rmagick 2.16.0 → 5.5.0

data/ext/RMagick/rmagick.h

@@ -16,25 +16,45 @@
 //! Suppress warnings about deprecated functions on Windows
 #define _CRT_SECURE_NO_DEPRECATE 1
 
-#include <assert.h>
-#include <stdio.h>
-#include <ctype.h>
-#if defined(HAVE_STDINT_H)
-#include <stdint.h>
-#endif
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-#if defined(HAVE_SYS_TYPES_H)
-#include <sys/types.h>
-#endif
-#include "ruby.h"
-#if defined(HAVE_RUBY_IO_H)
-#include "ruby/io.h"        // >= 1.9.0-5
+// ruby.h contains a C++ template, which cannot be included in extern "C".
+// Therefore, it includes the header in advance.
+#include "ruby/defines.h"
+
+extern "C" {
+    #include <assert.h>
+    #include <stdio.h>
+    #include <ctype.h>
+    #include <stdlib.h>
+    #include <math.h>
+    #include <sys/types.h>
+    #include "ruby.h"
+    #include "ruby/io.h"
+    #include "rmagick_gvl.h"
+}
+
+#if defined(__MINGW32__)
+    // Ruby defines wrong format specifiers for MinGW. So this defines original macro in here.
+    #if SIZEOF_SIZE_T == SIZEOF_LONG
+        #define RMIuSIZE  "lu"
+        #define RMIdSIZE  "ld"
+        #define RMIsVALUE "li\v"
+    #elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+        #define RMIuSIZE  "I64u"
+        #define RMIdSIZE  "I64d"
+        #define RMIsVALUE "I64i\v"
+    #endif
 #else
-#include "rubyio.h"
+    // Use constants defined in Ruby
+    #define RMIuSIZE  PRIuSIZE
+    #define RMIdSIZE  PRIdSIZE
+    #define RMIsVALUE PRIsVALUE
 #endif
 
+#if defined(__GNUC__)
+    #if __GNUC__ > 6
+        #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+    #endif
+#endif
 
 // Undef Ruby's versions of these symbols
 #undef PACKAGE_VERSION
@@ -44,14 +64,23 @@
 #undef PACKAGE_TARNAME
 #undef WORDS_BIGENDIAN
 
-#include "magick/MagickCore.h"
-#include "magick/magick-config.h"
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+#undef RUBY_TYPED_FROZEN_SHAREABLE
+#define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
 
-// Undef ImageMagick's versions of these symbols
-#undef PACKAGE_STRING
+#include "extconf.h"
 
+#if defined(IMAGEMAGICK_7)
+    #include "MagickCore/MagickCore.h"
+    #include "MagickCore/magick-config.h"
+#else
+    #include "magick/MagickCore.h"
+    #include "magick/magick-config.h"
+#endif
 
-#include "extconf.h"
+// Undef ImageMagick's versions of these symbols
+#undef PACKAGE_STRING
 
 
 //! For quoting preprocessor symbols
@@ -59,11 +88,18 @@
 //! For quoting preprocessor symbols
 #define Q(q) Q2(q)
 
+#ifdef __GNUC__
+#define ATTRIBUTE_UNUSED   __attribute__((unused))
+#define ATTRIBUTE_NORETURN __attribute__((__noreturn__))
+#else
+#define ATTRIBUTE_UNUSED
+#define ATTRIBUTE_NORETURN
+#endif
 
 //! Trace new image creation in bang methods
 #define UPDATE_DATA_PTR(_obj_, _new_) \
-    do { (void) rm_trace_creation(_new_);\
-    DATA_PTR(_obj_) = (void *)(_new_);\
+    do { \
+        DATA_PTR(_obj_) = (void *)(_new_); \
     } while(0)
 
 
@@ -85,65 +121,23 @@
 
 //! degrees to radians conversion
 #undef DegreesToRadians     // defined in ImageMagick.h in 6.0.2
-#define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0) 
+#define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
 
 //! pixel intensity calculation
 #define PIXEL_INTENSITY(q) ((Quantum)(0.299*(q)->red + 0.587*(q)->green + 0.114*(q)->blue + 0.5))
 
 //! find maximum of longs
-#define LMAX(a,b) ((((long)(a))>((long)(b)))?((long)(a)):((long)(b)))
+#define LMAX(a, b) ((((long)(a))>((long)(b)))?((long)(a)):((long)(b)))
 //! find maximum of floats
-#define FMAX(a,b) ((((double)(a))>((double)(b)))?((double)(a)):((double)(b)))
+#define FMAX(a, b) ((((double)(a))>((double)(b)))?((double)(a)):((double)(b)))
 //! find minimum of floats
-#define FMIN(a,b) ((((double)(a))<=((double)(b)))?((double)(a)):((double)(b)))
+#define FMIN(a, b) ((((double)(a))<=((double)(b)))?((double)(a)):((double)(b)))
 
 #define RMAGICK_PI 3.14159265358979  /**< pi */
 
 //! round to Quantum
 #define ROUND_TO_QUANTUM(value) ((Quantum) ((value) > (Quantum)QuantumRange ? QuantumRange : (value) + 0.5))
 
-
-// Ruby 1.9.0 changed the name to rb_frame_this_func
-#if defined(HAVE_RB_FRAME_THIS_FUNC)
-#define THIS_FUNC() rb_frame_this_func() /**< get the Ruby function being called */
-#else
-#define THIS_FUNC() rb_frame_last_func() /**< get the Ruby function being called */
-#endif
-
-// GetReadFile doesn't exist in Ruby 1.9.0
-#if !defined(GetReadFile)
-#define GetReadFile(fptr) rb_io_stdio_file(fptr) /**< Ruby read file pointer */
-#define GetWriteFile(fptr) rb_io_stdio_file(fptr) /**< Ruby write file pointer */
-#endif
-
-// rb_io_t replaces OpenFile in Ruby 1.9.0
-#if defined(HAVE_RB_IO_T)
-#undef OpenFile
-#define OpenFile rb_io_t /**< Ruby open file */
-#endif
-
-// 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) /**< Ruby string length */
-#endif
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(s) (RSTRING((s))->ptr) /**< Ruby string pointer */
-#endif
-
-// Backport these two macros to 1.8
-#if !defined(RARRAY_LEN)
-#define RARRAY_LEN(a) RARRAY((a))->len /**< Ruby array length */
-#endif
-// Matz says this macro is read-only! (see http://www.ruby-forum.com/topic/146072)
-#if !defined(RARRAY_PTR)
-#define RARRAY_PTR(a) RARRAY((a))->ptr /**< Ruby array pointer */
-#endif
-
-// Backport this macro to 1.8.6
-#if !defined(RB_GC_GUARD)
-#define RB_GC_GUARD(x) (x)
-#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
@@ -154,49 +148,53 @@
  */
 #define OBJ_TO_MAGICK_STRING(f, obj) \
     if ((obj) != Qnil)\
-        magick_clone_string(&f, RSTRING_PTR(obj));\
+    {\
+        VALUE str = rb_String(obj);\
+        magick_clone_string(&f, StringValueCStr(str));\
+    }\
     else\
         f = NULL;
 
 
-/** ImageMagick 6.5.7 replaced DestroyConstitute with
- * ConstituteComponentTerminus. Both have the same signature.
- */
-#if defined(HAVE_CONSTITUTECOMPONENTTERMINUS)
-#define DestroyConstitute(void) ConstituteComponentTerminus(void)
-#endif
-
-/** ImageMagick 6.5.9 replaced MagickLibSubversion with
- * MagickLibAddendum.
- */
-#if defined(HAVE_MAGICKLIBADDENDUM)
 #define MagickLibSubversion MagickLibAddendum
-#endif
-
-/** IM 6.4.1 replaced AllocateImage with AcquireImage.
- * Both have the same signature.
- */
-#if !defined(HAVE_ACQUIREIMAGE)
-#define AcquireImage(info) AllocateImage(info)
-#endif
 
-// ImageLayerMethod replaced MagickLayerMethod starting with 6.3.6
-#if defined(HAVE_TYPE_IMAGELAYERMETHOD)
-#define LAYERMETHODTYPE ImageLayerMethod /**< layer method */
-#define CLASS_LAYERMETHODTYPE Class_ImageLayerMethod /**< layer method class */
-#define LAYERMETHODTYPE_NAME ImageLayerMethod_name /**< layer method name */
-#define LAYERMETHODTYPE_NEW  ImageLayerMethod_new /**< new layer method */
+typedef ImageInfo Info; /**< Make type name match class name */
+#if defined(IMAGEMAGICK_7)
+    typedef struct _QuantumPixelPacket
+    {
+    Quantum
+        red,
+        green,
+        blue,
+        alpha,
+        black;
+    } QuantumPixelPacket;
+
+    typedef QuantumPixelPacket Pixel;
+    typedef PixelInfo MagickPixel;
+    typedef PixelInfo PixelColor;
 #else
-#define LAYERMETHODTYPE MagickLayerMethod /**< layer method */
-#define CLASS_LAYERMETHODTYPE Class_MagickLayerMethod /**< layer method class */
-#define LAYERMETHODTYPE_NAME MagickLayerMethod_name /**< layer method name */
-#define LAYERMETHODTYPE_NEW  MagickLayerMethod_new /**< new layer method */
+    typedef struct _RMagickPixelPacket
+    {
+    Quantum
+        red,
+        green,
+        blue,
+        opacity,
+        black;
+    } RMagickPixelPacket;
+    typedef RMagickPixelPacket Pixel;
+    typedef MagickPixelPacket MagickPixel;
+    typedef PixelPacket PixelColor;
+    typedef AlphaChannelType AlphaChannelOption;
+    typedef DistortImageMethod DistortMethod;
+    typedef FilterTypes FilterType;
+    typedef InterpolatePixelMethod PixelInterpolateMethod;
+    typedef ImageLayerMethod LayerMethod;
+    #define TransparentAlpha 0
+    #define IMAGEMAGICK_6 1
 #endif
 
-
-typedef ImageInfo Info; /**< Make type name match class name */
-typedef PixelPacket Pixel; /**< Make type name match class name */
-
 //! Montage
 typedef struct
 {
@@ -218,7 +216,7 @@ typedef struct
     DrawInfo *info;             /**< the DrawInfo struct */
     VALUE primitives;           /**< the primitive string */
     struct TmpFile_Name *tmpfile_ary; /**< the tmp filenames */
-    PixelPacket shadow_color;   /**< PolaroidOptions#shadow_color */
+    PixelColor shadow_color;   /**< PolaroidOptions#shadow_color */
 } Draw;             // make the type match the class name
 
 // Enum
@@ -293,53 +291,34 @@ typedef enum _QuantumExpressionOperator
     RShiftQuantumOperator,    /**< rshift */
     SubtractQuantumOperator,  /**< subtract */
     XorQuantumOperator,       /**< xor */
-#if defined(HAVE_ENUM_POWEVALUATEOPERATOR)
     PowQuantumOperator,       /**< pow */
-#endif
-#if defined(HAVE_ENUM_LOGEVALUATEOPERATOR)
     LogQuantumOperator,       /**< log */
-#endif
-#if defined(HAVE_ENUM_THRESHOLDEVALUATEOPERATOR)
     ThresholdQuantumOperator, /**< threshold */
-#endif
-#if defined(HAVE_ENUM_THRESHOLDBLACKEVALUATEOPERATOR)
     ThresholdBlackQuantumOperator, /**< threshold black */
-#endif
-#if defined(HAVE_ENUM_THRESHOLDWHITEEVALUATEOPERATOR)
     ThresholdWhiteQuantumOperator, /**< threshold white */
-#endif
-#if defined(HAVE_ENUM_GAUSSIANNOISEEVALUATEOPERATOR)
     GaussianNoiseQuantumOperator, /**< gaussian noise */
-#endif
-#if defined(HAVE_ENUM_IMPULSENOISEEVALUATEOPERATOR)
     ImpulseNoiseQuantumOperator, /**< impulse noise */
-#endif
-#if defined(HAVE_ENUM_LAPLACIANNOISEEVALUATEOPERATOR)
     LaplacianNoiseQuantumOperator, /**< laplacian noise */
-#endif
-#if defined(HAVE_ENUM_MULTIPLICATIVENOISEEVALUATEOPERATOR)
     MultiplicativeNoiseQuantumOperator, /**< multiplicative noise */
-#endif
-#if defined(HAVE_ENUM_POISSONNOISEEVALUATEOPERATOR)
     PoissonNoiseQuantumOperator, /**< poisson noise */
-#endif
-#if defined(HAVE_ENUM_UNIFORMNOISEEVALUATEOPERATOR)
     UniformNoiseQuantumOperator, /**< uniform noise */
-#endif
-#if defined(HAVE_ENUM_COSINEEVALUATEOPERATOR)
     CosineQuantumOperator,    /**< cosine */
-#endif
-#if defined(HAVE_ENUM_SINEEVALUATEOPERATOR)
+    SetQuantumOperator,       /**< set */
     SineQuantumOperator,      /**< sine */
-#endif
-#if defined(HAVE_ENUM_ADDMODULUSEVALUATEOPERATOR)
-    AddModulusQuantumOperator /**< add modulus */
+    AddModulusQuantumOperator, /**< add modulus */
+    MeanQuantumOperator, /**< mean */
+    AbsQuantumOperator, /**< abs */
+    ExponentialQuantumOperator, /**< exponential */
+    MedianQuantumOperator, /**< median */
+    SumQuantumOperator /**< sum */
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+    , RootMeanSquareQuantumOperator /** root mean square */
 #endif
 } QuantumExpressionOperator ;
 
 
 /** This implements the "omitted storage class model" for external variables.
- * (Ref: Harbison & Steele.) The rmmain.c file defines MAIN, which causes
+ * (Ref: Harbison & Steele.) The rmmain.cpp file defines MAIN, which causes
  * the single defining declarations to be generated. No other source files
  * define MAIN and therefore generate referencing declarations.
  */
@@ -354,8 +333,10 @@ typedef enum _QuantumExpressionOperator
 *   RMagick Module and Class VALUEs
 */
 EXTERN VALUE Module_Magick;
+EXTERN VALUE Module_DrawAttribute;
 EXTERN VALUE Class_ImageList;
 EXTERN VALUE Class_Info;
+EXTERN VALUE Class_KernelInfo;
 EXTERN VALUE Class_Draw;
 EXTERN VALUE Class_DrawOptions;
 EXTERN VALUE Class_Image;
@@ -384,7 +365,7 @@ EXTERN VALUE Class_QuantumExpressionOperator;
 // Enum classes
 EXTERN VALUE Class_Enum;
 EXTERN VALUE Class_AlignType;
-EXTERN VALUE Class_AlphaChannelType;
+EXTERN VALUE Class_AlphaChannelOption;
 EXTERN VALUE Class_AnchorType;
 EXTERN VALUE Class_ChannelType;
 EXTERN VALUE Class_ClassType;
@@ -394,271 +375,169 @@ EXTERN VALUE Class_CompositeOperator;
 EXTERN VALUE Class_CompressionType;
 EXTERN VALUE Class_DecorationType;
 EXTERN VALUE Class_DisposeType;
-EXTERN VALUE Class_DistortImageMethod;
-#if defined(HAVE_TYPE_DITHERMETHOD)
+EXTERN VALUE Class_DistortMethod;
 EXTERN VALUE Class_DitherMethod;
-#endif
 EXTERN VALUE Class_EndianType;
-EXTERN VALUE Class_FilterTypes;
+EXTERN VALUE Class_FilterType;
 EXTERN VALUE Class_GravityType;
 EXTERN VALUE Class_ImageType;
 EXTERN VALUE Class_InterlaceType;
-EXTERN VALUE Class_InterpolatePixelMethod;
-EXTERN VALUE CLASS_LAYERMETHODTYPE;
+EXTERN VALUE Class_LayerMethod;
 EXTERN VALUE Class_MagickFunction;
 EXTERN VALUE Class_NoiseType;
 EXTERN VALUE Class_OrientationType;
 EXTERN VALUE Class_PaintMethod;
+EXTERN VALUE Class_PixelInterpolateMethod;
 EXTERN VALUE Class_PreviewType;
 EXTERN VALUE Class_RenderingIntent;
 EXTERN VALUE Class_ResolutionType;
-#if defined(HAVE_SPARSECOLORIMAGE)
 EXTERN VALUE Class_SparseColorMethod;
-#endif
 EXTERN VALUE Class_SpreadMethod;
 EXTERN VALUE Class_StorageType;
 EXTERN VALUE Class_StretchType;
 EXTERN VALUE Class_StyleType;
 EXTERN VALUE Class_WeightType;
 EXTERN VALUE Class_VirtualPixelMethod;
+EXTERN VALUE Class_GeometryFlags;
+EXTERN VALUE Class_MorphologyMethod;
+EXTERN VALUE Class_KernelInfoType;
 
 /**
 *   Commonly-used IDs
 */
-EXTERN ID rm_ID_trace_proc;        /**< "@trace_proc" */
 EXTERN ID rm_ID_call;              /**< "call" */
 EXTERN ID rm_ID_changed;           /**< "changed" */
 EXTERN ID rm_ID_cur_image;         /**< "cur_image" */
 EXTERN ID rm_ID_dup;               /**< "dup" */
 EXTERN ID rm_ID_fill;              /**< "fill" */
-EXTERN ID rm_ID_flag;              /**< "flag" */
-EXTERN ID rm_ID_from_s;            /**< "from_s" */
 EXTERN ID rm_ID_Geometry;          /**< "Geometry" */
-EXTERN ID rm_ID_GeometryValue;     /**< "GeometryValue" */
-EXTERN ID rm_ID_has_key_q;         /**< "has_key?" */
 EXTERN ID rm_ID_height;            /**< "height" */
 EXTERN ID rm_ID_initialize_copy;   /**< "initialize_copy" */
-EXTERN ID rm_ID_length;            /**< "length" */
 EXTERN ID rm_ID_notify_observers;  /**< "notify_observers" */
 EXTERN ID rm_ID_new;               /**< "new" */
 EXTERN ID rm_ID_push;              /**< "push" */
-EXTERN ID rm_ID_spaceship;         /**< "<=>" */
-EXTERN ID rm_ID_to_i;              /**< "to_i" */
-EXTERN ID rm_ID_to_s;              /**< "to_s" */
 EXTERN ID rm_ID_values;            /**< "values" */
 EXTERN ID rm_ID_width;             /**< "width" */
-EXTERN ID rm_ID_x;                 /**< "x" */
-EXTERN ID rm_ID_y;                 /**< "y" */
+
+extern const rb_data_type_t rm_enum_data_type;
+extern const rb_data_type_t rm_info_data_type;
+extern const rb_data_type_t rm_image_data_type;
+extern const rb_data_type_t rm_draw_data_type;
+extern const rb_data_type_t rm_pixel_data_type;
+extern const rb_data_type_t rm_montage_data_type;
+extern const rb_data_type_t rm_kernel_info_data_type;
 
 #if !defined(min)
-#define min(a,b) ((a)<(b)?(a):(b)) /**< min of two values */
+#define min(a, b) ((a)<(b)?(a):(b)) /**< min of two values */
 #endif
 #if !defined(max)
-#define max(a,b) ((a)>(b)?(a):(b)) /**< max of two values */
+#define max(a, b) ((a)>(b)?(a):(b)) /**< max of two values */
 #endif
 
 /**
    Handle warnings & errors
 */
 //! Handle warnings & errors
-#define CHECK_EXCEPTION() rm_check_exception(exception, NULL, RetainOnError);
-
+#define CHECK_EXCEPTION() rm_check_exception(exception, NULL, RetainOnError)
 
-/*
-    Call rb_define_method for an attribute accessor method
-*/
-//! attribute reader
-#define DCL_ATTR_READER(class, attr) \
-    rb_define_method(Class_##class, #attr, class##_##attr, 0); 
-//! attribute writer
-#define DCL_ATTR_WRITER(class, attr) \
-    rb_define_method(Class_##class, #attr "=", class##_##attr##_eq, 1);
-//! attribute accessor
-#define DCL_ATTR_ACCESSOR(class, attr) \
-    DCL_ATTR_READER(class, attr) \
-    DCL_ATTR_WRITER(class, attr)
-//! Borrow another class' attribute writer definition
-#define SHARE_ATTR_WRITER(to, from, attr) \
-    rb_define_method(Class_##to, #attr "=", from##_##attr##_eq, 1);
 
 /*
     Define simple attribute accessor methods (boolean, int, string, and double types)
 */
-#define C_bool_to_R_bool(attr) (attr) ? Qtrue : Qfalse /**< C boolean -> Ruby boolean */
-#define R_bool_to_C_bool(attr) RTEST(attr) /**<  C boolean <- Ruby boolean */
+#define C_boolean_to_R_boolean(attr) (attr) ? Qtrue : Qfalse /**< C boolean -> Ruby boolean */
+#define R_boolean_to_C_boolean(attr) (MagickBooleanType)RTEST(attr) /**<  C boolean <- Ruby boolean */
 #define C_int_to_R_int(attr) INT2FIX(attr) /**< C int -> Ruby int */
 #define R_int_to_C_int(attr) NUM2INT(attr) /**< C int <- Ruby int */
-#define C_long_to_R_long(attr) INT2NUM(attr) /**< C long -> Ruby long */
+#define C_long_to_R_long(attr) LONG2NUM(attr) /**< C long -> Ruby long */
 #define R_long_to_C_long(attr) NUM2LONG(attr) /**< C long <- Ruby long */
-#define C_ulong_to_R_ulong(attr) UINT2NUM(attr) /**< C unsigned long -> Ruby unsigned long */
+#define C_ulong_to_R_ulong(attr) ULONG2NUM(attr) /**< C unsigned long -> Ruby unsigned long */
 #define R_ulong_to_C_ulong(attr) NUM2ULONG(attr) /**< C unsigned long <- Ruby unsigned long */
 #define C_str_to_R_str(attr) attr ? rb_str_new2(attr) : Qnil /**< C string -> Ruby string */
 #define C_dbl_to_R_dbl(attr) rb_float_new(attr) /**< C double -> Ruby double */
 #define R_dbl_to_C_dbl(attr) NUM2DBL(attr) /**< C double <- Ruby double */
 
 //! define attribute reader
-#define DEF_ATTR_READER(class, attr, type) \
-    VALUE class##_##attr(VALUE self)\
+#define IMPLEMENT_TYPED_ATTR_READER(klass, attr, type, data_type) \
     {\
-        class *ptr;\
+        klass *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
-            (void) rm_check_destroyed(self); \
+            rm_check_destroyed(self); \
         }\
-        Data_Get_Struct(self, class, ptr);\
+        TypedData_Get_Struct(self, klass, data_type, ptr);\
         return C_##type##_to_R_##type(ptr->attr);\
     }
 
 //! define attribute reader when attribute name is different from the field name
-#define DEF_ATTR_READERF(class, attr, field, type) \
-    VALUE class##_##attr(VALUE self)\
+#define IMPLEMENT_TYPED_ATTR_READERF(klass, attr, field, type, data_type) \
     {\
-        class *ptr;\
-        (void) rm_check_destroyed(self); \
-        Data_Get_Struct(self, class, ptr);\
+        klass *ptr;\
+        rm_check_destroyed(self); \
+        TypedData_Get_Struct(self, klass, data_type, ptr);\
         return C_##type##_to_R_##type(ptr->field);\
     }
 
 //! define attribute writer
-#define DEF_ATTR_WRITER(class, attr, type) \
-    VALUE class##_##attr##_eq(VALUE self, VALUE val)\
+#define IMPLEMENT_TYPED_ATTR_WRITER(klass, attr, type, data_type) \
     {\
-        class *ptr;\
+        klass *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
-            (void) rm_check_destroyed(self); \
+            rm_check_destroyed(self); \
         }\
         rb_check_frozen(self);\
-        Data_Get_Struct(self, class, ptr);\
+        TypedData_Get_Struct(self, klass, data_type, ptr);\
         ptr->attr = R_##type##_to_C_##type(val);\
+        return val;\
+    }
+
+//! define attribute writer when attribute name is different from the field name
+#define IMPLEMENT_TYPED_ATTR_WRITERF(klass, attr, field, type, data_type) \
+    {\
+        klass *ptr;\
+        if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
+            rm_check_destroyed(self); \
+        }\
+        rb_check_frozen(self);\
+        TypedData_Get_Struct(self, klass, data_type, ptr);\
+        ptr->field = R_##type##_to_C_##type(val);\
         return self;\
     }
 
-//! define attribute accessor
-#define DEF_ATTR_ACCESSOR(class, attr, type)\
-    DEF_ATTR_READER(class, attr, type)\
-    DEF_ATTR_WRITER(class, attr, type)
 
 /*
  *  Declare attribute accessors
  */
 //! declare attribute reader
-#define ATTR_READER(class, attr) \
-    extern VALUE class##_##attr(VALUE);
+#define ATTR_READER(klass, attr) \
+    extern VALUE klass##_##attr(VALUE);
 //! declare attribute writer
-#define ATTR_WRITER(class, attr) \
-    extern VALUE class##_##attr##_eq(VALUE, VALUE);
+#define ATTR_WRITER(klass, attr) \
+    extern VALUE klass##_##attr##_eq(VALUE, VALUE);
 //! declare attribute accessor
-#define ATTR_ACCESSOR(class, attr) \
-    ATTR_READER(class, attr)\
-    ATTR_WRITER(class, attr)
-
-/*
- *  Define functions to get/set attributes in Image::Info that
- *  use the Get/SetImageOption API.
-*/
-//! Option attribute reader. For Image::Info.
-#define OPTION_ATTR_READER(opt, key) \
-    VALUE Info_##opt(VALUE self)\
-    {\
-        return get_option(self, #key);\
-    }
-//! Option attribute writer. For Image::Info.
-#define OPTION_ATTR_WRITER(opt, key) \
-    VALUE Info_##opt##_eq(VALUE self, VALUE string)\
-    {\
-        return set_option(self, #key, string);\
-    }
-//! Option attribute accessor. For Image::Info.
-#define OPTION_ATTR_ACCESSOR(opt, key)\
-    OPTION_ATTR_READER(opt, key)\
-    OPTION_ATTR_WRITER(opt, key)
-
-
-/*
- *  Declare Pixel channel attribute writers
-*/
-//! Pixel channel attribute writer.
-#define DEF_PIXEL_CHANNEL_WRITER(_channel_) \
-extern VALUE \
-Pixel_##_channel_##_eq(VALUE self, VALUE v) \
-{ \
-    Pixel *pixel; \
- \
-    rb_check_frozen(self); \
-    Data_Get_Struct(self, Pixel, pixel); \
-    pixel->_channel_ = APP2QUANTUM(v); \
-    (void) rb_funcall(self, rm_ID_changed, 0); \
-    (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
-    return QUANTUM2NUM((pixel->_channel_)); \
-}
-
-
-/*
- *  Declare Pixel CMYK channel attribute accessors
-*/
-//! Pixel CMYK channel attribute accessor.
-#define DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(_cmyk_channel_, _rgb_channel_) \
-extern VALUE \
-Pixel_##_cmyk_channel_##_eq(VALUE self, VALUE v) \
-{ \
-    Pixel *pixel; \
- \
-    rb_check_frozen(self); \
-    Data_Get_Struct(self, Pixel, pixel); \
-    pixel->_rgb_channel_ = APP2QUANTUM(v); \
-    (void) rb_funcall(self, rm_ID_changed, 0); \
-    (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
-    return QUANTUM2NUM(pixel->_rgb_channel_); \
-} \
- \
-extern VALUE \
-Pixel_##_cmyk_channel_(VALUE self) \
-{ \
-    Pixel *pixel; \
- \
-    Data_Get_Struct(self, Pixel, pixel); \
-    return INT2NUM(pixel->_rgb_channel_); \
-}
+#define ATTR_ACCESSOR(klass, attr) \
+    ATTR_READER(klass, attr)\
+    ATTR_WRITER(klass, attr)
 
 
-/*
- *  Enum constants - define a subclass of Enum for the specified enumeration.
- *  Define an instance of the subclass for each member in the enumeration.
- *  Initialize each instance with its name and value.
- */
-//! define Ruby enum
-#define DEF_ENUM(tag) {\
-   VALUE _cls, _enum;\
-   _cls =  Class_##tag = rm_define_enum_type(#tag);
-
-//! define Ruby enumerator elements
-#define ENUMERATOR(val)\
-   _enum = rm_enum_new(_cls, ID2SYM(rb_intern(#val)), INT2NUM(val));\
-   rb_define_const(Module_Magick, #val, _enum);
-//! end of an enumerator
-#define END_ENUM }
-
 //!  Define a Magick module constant
 #if MAGICKCORE_QUANTUM_DEPTH == 64
 #define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, ULL2NUM(constant))
+#define DEF_CONSTV(constant, val) rb_define_const(Module_Magick, #constant, ULL2NUM(val))
 #else   // MAGICKCORE_QUANTUM_DEPTH == 8, 16, 32
 #define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, UINT2NUM(constant))
+#define DEF_CONSTV(constant, val) rb_define_const(Module_Magick, #constant, UINT2NUM(val))
 #endif
 
-
 //! Convert a Ruby enum constant back to a C enum member.
 #define VALUE_TO_ENUM(value, e, type) \
    do {\
    MagickEnum *magick_enum;\
    if (CLASS_OF(value) != Class_##type)\
-       rb_raise(rb_eTypeError, "wrong enumeration type - expected %s, got %s"\
-                   , rb_class2name(Class_##type),rb_class2name(CLASS_OF(value)));\
-   Data_Get_Struct(value, MagickEnum, magick_enum);\
+       rb_raise(rb_eTypeError, "wrong enumeration type - expected %s, got %s", \
+                rb_class2name(Class_##type), rb_class2name(CLASS_OF(value)));\
+   TypedData_Get_Struct(value, MagickEnum, &rm_enum_data_type, magick_enum);\
    e = (type)(magick_enum->val);\
    } while(0)
 
-//! create case statement, mapping enum to its name
-#define ENUM_TO_NAME(_enum) case _enum: return #_enum;
-
 
 // Method, external function declarations. These declarations are
 // grouped by the source file in which the methods are defined.
@@ -668,11 +547,13 @@ Pixel_##_cmyk_channel_(VALUE self) \
 // the same source file.
 
 
-// rmmain.c
+extern "C" {
+
+// rmmain.cpp
 extern void Init_RMagick2(void);
 
 
-// rmagick.c
+// rmagick.cpp
 extern VALUE Magick_colors(VALUE);
 extern VALUE Magick_fonts(VALUE);
 extern VALUE Magick_init_formats(VALUE);
@@ -681,7 +562,7 @@ 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
+// rmdraw.cpp
 ATTR_WRITER(Draw, affine)
 ATTR_WRITER(Draw, align)
 ATTR_WRITER(Draw, border_color)
@@ -732,7 +613,7 @@ ATTR_WRITER(PolaroidOptions, shadow_color);
 ATTR_WRITER(PolaroidOptions, border_color);
 
 
-// rmmontage.c
+// rmmontage.cpp
 ATTR_WRITER(Montage, background_color)
 ATTR_WRITER(Montage, border_color)
 ATTR_WRITER(Montage, border_width)
@@ -755,17 +636,16 @@ extern VALUE Montage_alloc(VALUE);
 extern VALUE rm_montage_new(void);
 
 
-// rmilist.c
+// rmilist.cpp
 extern VALUE ImageList_animate(int, VALUE *, VALUE);
 extern VALUE ImageList_append(VALUE, VALUE);
 extern VALUE ImageList_average(VALUE);
 extern VALUE ImageList_coalesce(VALUE);
+extern VALUE ImageList_combine(int, VALUE *, VALUE);
 extern VALUE ImageList_composite_layers(int, VALUE *, VALUE);
 extern VALUE ImageList_deconstruct(VALUE);
 extern VALUE ImageList_display(VALUE);
 extern VALUE ImageList_flatten_images(VALUE);
-extern VALUE ImageList_fx(int, VALUE *, VALUE);
-extern VALUE ImageList_map(int, VALUE *, VALUE);
 extern VALUE ImageList_montage(VALUE);
 extern VALUE ImageList_morph(VALUE, VALUE);
 extern VALUE ImageList_mosaic(VALUE);
@@ -778,7 +658,7 @@ extern VALUE ImageList_write(VALUE, VALUE);
 extern VALUE rm_imagelist_from_images(Image *);
 
 
-// rminfo.c
+// rminfo.cpp
 ATTR_ACCESSOR(Info, antialias)
 ATTR_ACCESSOR(Info, attenuate)
 ATTR_ACCESSOR(Info, authenticate)
@@ -802,7 +682,6 @@ ATTR_ACCESSOR(Info, font)
 ATTR_ACCESSOR(Info, format)
 ATTR_ACCESSOR(Info, fuzz)
 ATTR_ACCESSOR(Info, gravity)
-ATTR_ACCESSOR(Info, group)
 ATTR_ACCESSOR(Info, image_type)
 ATTR_ACCESSOR(Info, interlace)
 ATTR_ACCESSOR(Info, label)
@@ -814,7 +693,6 @@ ATTR_ACCESSOR(Info, orientation)
 ATTR_ACCESSOR(Info, origin)
 ATTR_ACCESSOR(Info, page)
 ATTR_ACCESSOR(Info, pen)
-// ATTR_ACCESSOR(Info, ping) obsolete
 ATTR_ACCESSOR(Info, pointsize)
 ATTR_ACCESSOR(Info, quality)
 ATTR_ACCESSOR(Info, sampling_factor)
@@ -829,7 +707,6 @@ ATTR_ACCESSOR(Info, transparent_color)
 ATTR_ACCESSOR(Info, undercolor)
 ATTR_ACCESSOR(Info, units)
 ATTR_ACCESSOR(Info, view)
-//ATTR_ACCESSOR(Info, verbose)
 
 extern VALUE Info_alloc(VALUE);
 
@@ -843,15 +720,26 @@ extern VALUE rm_info_new(void);
 extern DisposeType rm_dispose_to_enum(const char *);
 extern GravityType rm_gravity_to_enum(const char *);
 
-// rmimage.c
-ATTR_WRITER(Image, alpha)
+// rmkinfo.cpp
+
+extern VALUE KernelInfo_alloc(VALUE);
+
+extern VALUE KernelInfo_initialize(VALUE, VALUE);
+extern VALUE KernelInfo_unity_add(VALUE, VALUE);
+extern VALUE KernelInfo_scale(VALUE, VALUE, VALUE);
+extern VALUE KernelInfo_scale_geometry(VALUE, VALUE);
+extern VALUE KernelInfo_clone(VALUE);
+
+extern VALUE KernelInfo_builtin(VALUE, VALUE, VALUE);
+
+
+// rmimage.cpp
 ATTR_ACCESSOR(Image, background_color)
 ATTR_READER(Image, base_columns)
 ATTR_READER(Image, base_filename)
 ATTR_READER(Image, base_rows)
 ATTR_ACCESSOR(Image, bias)
 ATTR_ACCESSOR(Image, black_point_compensation)
-ATTR_ACCESSOR(Image, blur)
 ATTR_ACCESSOR(Image, border_color)
 ATTR_READER(Image, bounding_box)
 ATTR_ACCESSOR(Image, chromaticity)
@@ -881,8 +769,6 @@ ATTR_ACCESSOR(Image, image_type)
 ATTR_ACCESSOR(Image, interlace)
 ATTR_ACCESSOR(Image, iptc_profile)
 ATTR_ACCESSOR(Image, iterations)
-ATTR_WRITER(Image, mask)
-ATTR_ACCESSOR(Image, matte)
 ATTR_ACCESSOR(Image, matte_color)
 ATTR_READER(Image, mean_error_per_pixel)
 ATTR_READER(Image, mime_type)
@@ -892,7 +778,6 @@ ATTR_READER(Image, normalized_mean_error)
 ATTR_READER(Image, normalized_maximum_error)
 ATTR_READER(Image, number_colors)
 ATTR_ACCESSOR(Image, offset)
-ATTR_WRITER(Image, opacity)
 ATTR_ACCESSOR(Image, orientation)
 ATTR_ACCESSOR(Image, page)
 ATTR_ACCESSOR(Image, pixel_interpolation_method)
@@ -912,7 +797,7 @@ ATTR_ACCESSOR(Image, x_resolution)
 ATTR_ACCESSOR(Image, y_resolution)
 
 extern ChannelType extract_channels(int *, VALUE *);
-extern void raise_ChannelType_error(VALUE);
+extern void raise_ChannelType_error(VALUE) ATTRIBUTE_NORETURN;
 extern void add_format_prefix(Info *, VALUE);
 
 extern VALUE Image_alloc(VALUE);
@@ -954,6 +839,11 @@ extern VALUE Image_compare_channel(int, VALUE *, VALUE);
 extern VALUE Image_channel_depth(int, VALUE *, VALUE);
 extern VALUE Image_channel_extrema(int, VALUE *, VALUE);
 extern VALUE Image_channel_mean(int, VALUE *, VALUE);
+#if defined(HAVE_GETIMAGECHANNELENTROPY) || defined(IMAGEMAGICK_7)
+extern VALUE Image_channel_entropy(int, VALUE *, VALUE);
+#else
+extern VALUE Image_channel_entropy(int, VALUE *, VALUE) ATTRIBUTE_NORETURN;
+#endif
 extern VALUE Image_charcoal(int, VALUE *, VALUE);
 extern VALUE Image_chop(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_clone(VALUE);
@@ -962,7 +852,6 @@ extern VALUE Image_color_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_color_histogram(VALUE);
 extern VALUE Image_colorize(int, VALUE *, VALUE);
 extern VALUE Image_colormap(int, VALUE *, VALUE);
-extern VALUE Image_combine(int, VALUE *, VALUE);
 extern VALUE Image_composite(int, VALUE *, VALUE);
 extern VALUE Image_composite_affine(VALUE, VALUE, VALUE);
 extern VALUE Image_composite_bang(int, VALUE *, VALUE);
@@ -977,6 +866,8 @@ extern VALUE Image_contrast(int, VALUE *, VALUE);
 extern VALUE Image_contrast_stretch_channel(int, VALUE *, VALUE);
 extern VALUE Image_convolve(VALUE, VALUE, VALUE);
 extern VALUE Image_convolve_channel(int, VALUE *, VALUE);
+extern VALUE Image_morphology(VALUE, VALUE, VALUE, VALUE);
+extern VALUE Image_morphology_channel(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_copy(VALUE);
 extern VALUE Image_crop(int, VALUE *, VALUE);
 extern VALUE Image_crop_bang(int, VALUE *, VALUE);
@@ -1019,6 +910,7 @@ extern VALUE Image_flop_bang(VALUE);
 extern VALUE Image_frame(int, VALUE *, VALUE);
 extern VALUE Image_from_blob(VALUE, VALUE);
 extern VALUE Image_function_channel(int, VALUE *, VALUE);
+extern VALUE Image_fx(int, VALUE *, VALUE);
 extern VALUE Image_gamma_channel(int, VALUE *, VALUE);
 extern VALUE Image_gamma_correct(int, VALUE *, VALUE);
 extern VALUE Image_gaussian_blur(int, VALUE *, VALUE);
@@ -1039,11 +931,10 @@ extern VALUE Image_liquid_rescale(int, VALUE *, VALUE);
 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_matte_flood_fill(int, VALUE *, VALUE);
 extern VALUE Image_median_filter(int, VALUE *, VALUE);
 extern VALUE Image_minify(VALUE);
 extern VALUE Image_minify_bang(VALUE);
@@ -1115,7 +1006,6 @@ extern VALUE Image_stereo(VALUE, VALUE);
 extern VALUE Image_store_pixels(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_strip_bang(VALUE);
 extern VALUE Image_swirl(VALUE, VALUE);
-extern VALUE Image_sync_profiles(VALUE);
 extern VALUE Image_texture_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_threshold(VALUE, VALUE);
 extern VALUE Image_thumbnail(int, VALUE *, VALUE);
@@ -1144,10 +1034,9 @@ extern VALUE Image_write(VALUE, VALUE);
 
 extern VALUE rm_image_new(Image *);
 extern void  rm_image_destroy(void *);
-extern void  rm_trace_creation(Image *);
 
 
-// rmfill.c
+// rmfill.cpp
 extern VALUE  GradientFill_alloc(VALUE);
 extern VALUE  GradientFill_initialize(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE  GradientFill_fill(VALUE, VALUE);
@@ -1157,18 +1046,17 @@ extern VALUE  TextureFill_initialize(VALUE, VALUE);
 extern VALUE  TextureFill_fill(VALUE, VALUE);
 
 
-// rmpixel.c
+// rmpixel.cpp
 
 
 ATTR_ACCESSOR(Pixel, red)
 ATTR_ACCESSOR(Pixel, green)
 ATTR_ACCESSOR(Pixel, blue)
-ATTR_ACCESSOR(Pixel, opacity)
+ATTR_ACCESSOR(Pixel, alpha)
 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);
@@ -1176,7 +1064,6 @@ extern VALUE  Pixel_dup(VALUE);
 extern VALUE  Pixel_eql_q(VALUE, VALUE);
 extern VALUE  Pixel_fcmp(int, VALUE *, VALUE);
 extern VALUE  Pixel_from_color(VALUE, VALUE);
-extern VALUE  Pixel_from_HSL(VALUE, VALUE);
 extern VALUE  Pixel_from_hsla(int, VALUE *, VALUE);
 extern VALUE  Pixel_hash(VALUE);
 extern VALUE  Pixel_initialize(int, VALUE *, VALUE);
@@ -1186,42 +1073,57 @@ 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);
 
 
-// rmenum.c
+// rmenum.cpp
 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_bitwise_or(VALUE, VALUE);
 extern VALUE  Enum_case_eq(VALUE, VALUE);
 extern VALUE  Enum_type_initialize(VALUE, VALUE, VALUE);
+extern VALUE  Enum_find(VALUE, int);
 extern VALUE  Enum_type_each(VALUE);
 extern VALUE  rm_enum_new(VALUE, VALUE, VALUE);
+extern VALUE  ClassType_find(ClassType);
+extern VALUE  ColorspaceType_find(ColorspaceType);
+extern const char *ComplianceType_name(ComplianceType *);
+extern VALUE  ComplianceType_find(ComplianceType);
+extern VALUE  CompositeOperator_find(CompositeOperator);
+extern VALUE  CompressionType_find(CompressionType);
+extern VALUE  DisposeType_find(DisposeType);
+extern VALUE  EndianType_find(EndianType);
+extern VALUE  FilterType_find(FilterType);
+extern VALUE  GravityType_find(GravityType);
+extern VALUE  ImageType_find(ImageType);
+extern VALUE  InterlaceType_find(InterlaceType);
+extern VALUE  OrientationType_find(OrientationType);
+extern VALUE  PixelInterpolateMethod_find(PixelInterpolateMethod);
+extern VALUE  RenderingIntent_find(RenderingIntent);
+extern VALUE  ResolutionType_find(ResolutionType);
+extern const char *StorageType_name(StorageType);
+extern VALUE  StretchType_find(StretchType);
+extern const char *StretchType_name(StretchType);
+extern VALUE  StyleType_find(StyleType);
+extern const char *StyleType_name(StyleType);
+extern VALUE  VirtualPixelMethod_find(VirtualPixelMethod);
 
 
-// rmstruct.c
+// rmstruct.cpp
 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 void   Color_to_PixelColor(PixelColor *, VALUE);
+extern void   Color_to_MagickPixel(Image *, MagickPixel *, VALUE);
+extern void   Color_to_Pixel(Pixel *, 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_MagickPixel(const MagickPixel *);
+extern VALUE  Pixel_from_PixelColor(const PixelColor *);
 extern VALUE  Pixel_from_PixelPacket(const PixelPacket *);
 extern void   Export_PointInfo(PointInfo *, VALUE);
 extern VALUE  Import_PointInfo(PointInfo *);
@@ -1229,16 +1131,12 @@ extern VALUE  PrimaryInfo_to_s(VALUE);
 extern VALUE  Import_PrimaryInfo(PrimaryInfo *);
 extern VALUE  RectangleInfo_to_s(VALUE);
 extern VALUE  Import_RectangleInfo(RectangleInfo *);
-extern VALUE  RenderingIntent_new(RenderingIntent);
-extern VALUE  ResolutionType_new(ResolutionType);
 extern VALUE  SegmentInfo_to_s(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   Export_PrimaryInfo(PrimaryInfo *, VALUE);
 extern void   Export_RectangleInfo(RectangleInfo *, VALUE);
 extern void   Export_SegmentInfo(SegmentInfo *, VALUE);
@@ -1248,48 +1146,50 @@ extern VALUE  Import_TypeInfo(const TypeInfo *);
 extern VALUE  TypeMetric_to_s(VALUE);
 extern void   Export_TypeInfo(TypeInfo *, VALUE);
 extern VALUE  Import_TypeMetric(TypeMetric *);
-extern const char *StorageType_name(StorageType);
-extern VALUE  VirtualPixelMethod_new(VirtualPixelMethod);
-extern VALUE  LAYERMETHODTYPE_NEW(LAYERMETHODTYPE);
 
 
-// rmutil.c
+// rmutil.cpp
 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 Image *rm_acquire_image(ImageInfo *);
 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 VALUE  rm_pixelcolor_to_color_name(Image *, PixelColor *);
+extern VALUE  rm_pixelcolor_to_color_name_info(Info *, PixelColor *);
+extern void   rm_init_magickpixel(const Image *, MagickPixel *);
+extern void   rm_set_magickpixel(MagickPixel *, const char *);
+extern VALUE  rm_no_freeze(VALUE) ATTRIBUTE_NORETURN;
 extern int    rm_strcasecmp(const char *, const char *);
 extern int    rm_strncasecmp(const char *, const char *, size_t);
+extern size_t rm_strnlen_s(const char *, size_t);
 extern void   rm_check_ary_len(VALUE, long);
+extern VALUE  rm_check_ary_type(VALUE ary);
 extern Image *rm_check_destroyed(VALUE);
 extern Image *rm_check_frozen(VALUE);
-extern VALUE  rm_to_s(VALUE);
-extern char  *rm_str2cstr(VALUE, long *);
+extern char  *rm_str2cstr(VALUE, size_t *);
 extern int    rm_check_num2dbl(VALUE);
 extern double rm_fuzz_to_dbl(VALUE);
 extern Quantum rm_app2quantum(VALUE);
-extern double rm_percentage(VALUE,double);
-extern double rm_str_to_pct(VALUE);
+extern double rm_percentage(VALUE, double);
+extern double rm_percentage2(VALUE, double, bool);
+extern double rm_str_to_pct(VALUE, bool);
 extern VALUE  rm_define_enum_type(const char *);
-extern void   rm_write_temp_image(Image *, char *);
+extern void   rm_write_temp_image(Image *, char *, size_t);
 extern void   rm_delete_temp_image(char *);
-extern void   rm_not_implemented(void);
+extern void   rm_not_implemented(void) ATTRIBUTE_NORETURN;
 extern void   rm_attr_write(VALUE, VALUE);
-extern void   rm_get_geometry(VALUE, long *, long *, unsigned long *, unsigned long *, int *);
 extern const char *rm_get_property(const Image *, const char *);
 extern MagickBooleanType rm_set_property(Image *, const char *, const char *);
 extern void   rm_set_user_artifact(Image *, Info *);
-void          rm_set_magick_pixel_packet(Pixel *, MagickPixelPacket *);
 extern void   rm_sync_image_options(Image *, Info *);
 extern void   rm_split(Image *);
-extern void   rm_magick_error(const char *, const char *);
+extern void   rm_magick_error(const char *);
+#if defined(IMAGEMAGICK_7)
+extern void   rm_set_pixelinfo_alpha(PixelInfo *, const MagickRealType);
+#endif
 
 //! whether to retain on errors
 typedef enum
@@ -1298,16 +1198,43 @@ typedef enum
     DestroyOnError = 1 /**< do not retain on error */
 } ErrorRetention;
 
-extern void   rm_check_image_exception(Image *, ErrorRetention);
+typedef enum
+{
+    RetainExceptionRetention,
+    DestroyExceptionRetention
+} ExceptionRetention;
+
 extern void   rm_check_exception(ExceptionInfo *, Image *, ErrorRetention);
 extern void   rm_ensure_result(Image *);
 extern Image *rm_clone_image(Image *);
-extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetType, const MagickSizeType, void *);
 extern VALUE  rm_exif_by_entry(Image *);
 extern VALUE  rm_exif_by_number(Image *);
 extern void   rm_get_optional_arguments(VALUE);
-extern void   rm_fatal_error_handler(const ExceptionType, const char *, const char *);
+extern void   rm_fatal_error_handler(const ExceptionType, const char *, const char *) ATTRIBUTE_NORETURN;
 extern void   rm_error_handler(const ExceptionType, const char *, const char *);
 extern void   rm_warning_handler(const ExceptionType, const char *, const char *);
+extern MagickBooleanType rm_should_raise_exception(ExceptionInfo *, const ExceptionRetention);
+extern void   rm_raise_exception(ExceptionInfo *);
+extern VALUE  rm_io_path(VALUE);
+#if defined(IMAGEMAGICK_6)
+extern void   rm_check_image_exception(Image *, ErrorRetention);
 #endif
 
+#if !defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0)
+/* UnityAddKernelInfo() was private function until IM 6.9 */
+MagickExport void UnityAddKernelInfo(KernelInfo *kernel, const double scale);
+/* ScaleKernelInfo() was private function until IM 6.9 */
+MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor, const GeometryFlags normalize_flags);
+#endif
+
+#if (RUBY_VERSION_MAJOR == 2 && RUBY_VERSION_MINOR < 7)
+    #define RESCUE_FUNC(func)                   (VALUE (*)(ANYARGS))(func)
+    #define RESCUE_EXCEPTION_HANDLER_FUNC(func) (VALUE (*)(ANYARGS))(func)
+#else
+    #define RESCUE_FUNC(func)                   (VALUE(*)(VALUE))(func)
+    #define RESCUE_EXCEPTION_HANDLER_FUNC(func) (VALUE(*)(VALUE, VALUE))(func)
+#endif
+
+} // extern "C"
+
+#endif