rmagick 1.15.17 → 2.0.0

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.152.2.4.2.3 2008/10/01 22:50:58 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.211 2007/12/26 21:41:48 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -12,12 +12,19 @@
 #include <assert.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <stdint.h>
 #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_INTERN_H)
+#include "ruby/intern.h"
+#else
 #include "intern.h"
+#endif
 #include "rubyio.h"
 
 
@@ -28,50 +35,42 @@
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE_TARNAME
 
-
-#include "magick/api.h"
+#include "magick/MagickCore.h"
 
 // Undef ImageMagick's versions of these symbols
-#undef PACKAGE_VERSION
-#undef PACKAGE_NAME
 #undef PACKAGE_STRING
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_TARNAME
 
 
-#include "rmagick_config.h"
+#include "extconf.h"
 
-// Define a pair of macros that make it easier to code
-// 1.6 and 1.8 alternatives. Code enclosed in RUBY18()
-// is present when compiled for 1.8.0 and later. Code
-// enclosed in RUBY16 is present for 1.6 versions.
-#if RUBY_VERSION >= 0x180
-#define RUBY18(d) d
-#define RUBY16(d)
-#else
-#define RUBY18(d)
-#define RUBY16(d) d
-#endif
 
-// Backport these definitions to Ruby 1.6.7
-#if !defined(ULONG2NUM)
-#define ULONG2NUM(v) UINT2NUM(v)
-#endif
+// For quoting preprocessor symbols
+#define Q2(q) #q
+#define Q(q) Q2(q)
 
-#if !defined(LONG2NUM)
-#define LONG2NUM(v) INT2NUM(v)
-#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_);\
+    } while(0)
 
-// Define a version of StringValuePtr that works in both 1.6 and 1.8.
-#if !defined(StringValuePtr)
-#define STRING_PTR(v) rm_string_value_ptr(&(v))
+
+// Handle Quantum <-> Ruby Numeric object conversion
+#if (QuantumDepth == 8 || QuantumDepth == 16)
+#define QUANTUM2NUM(q) INT2FIX((q))
+#define NUM2QUANTUM(n) (Quantum)NUM2UINT((n))
+#elif (QuantumDepth == 32)
+#define QUANTUM2NUM(q) UINT2NUM((q))
+#define NUM2QUANTUM(n) (Quantum)NUM2UINT((n))
+#elif (QuantumDepth == 64)
+#define QUANTUM2NUM(q) ULL2NUM((q))
+#define NUM2QUANTUM(n) (Quantum)NUM2ULL((n))
 #else
-#define STRING_PTR(v) StringValuePtr(v)
+#error Specified QuantumDepth is not supported.
 #endif
-
-// Safe replacement for rb_str2cstr
-#define STRING_PTR_LEN(v,l) rm_string_value_ptr_len(&(v), &(l))
+// Convert user-supplied objects to Quantum
+#define APP2QUANTUM(n) rm_app2quantum((n))
 
 #undef DegreesToRadians     // defined in ImageMagick.h in 6.0.2
 #define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
@@ -83,6 +82,41 @@
 #define FMAX(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
+#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()
+#else
+#define THIS_FUNC() rb_frame_last_func()
+#endif
+
+// GetReadFile doesn't exist in Ruby 1.9.0
+#if !defined(GetReadFile)
+#define GetReadFile(fptr) rb_io_stdio_file(fptr)
+#define GetWriteFile(fptr) rb_io_stdio_file(fptr)
+#endif
+
+// rb_io_t replaces OpenFile in Ruby 1.9.0
+#if defined(HAVE_RB_IO_T)
+#undef OpenFile
+#define OpenFile rb_io_t
+#endif
+
+// ImageLayerMethod replaced MagickLayerMethod starting with 6.3.6
+#if defined(HAVE_TYPE_IMAGELAYERMETHOD)
+#define LAYERMETHODTYPE ImageLayerMethod
+#define CLASS_LAYERMETHODTYPE Class_ImageLayerMethod
+#define LAYERMETHODTYPE_NAME ImageLayerMethod_name
+#define LAYERMETHODTYPE_NEW  ImageLayerMethod_new
+#else
+#define LAYERMETHODTYPE MagickLayerMethod
+#define CLASS_LAYERMETHODTYPE Class_MagickLayerMethod
+#define LAYERMETHODTYPE_NAME MagickLayerMethod_name
+#define LAYERMETHODTYPE_NEW  MagickLayerMethod_new
+#endif
+
 
 typedef ImageInfo Info; // Make type name match class name
 typedef PixelPacket Pixel;
@@ -157,7 +191,6 @@ typedef struct
 
 #define MAX_GEOM_STR 51                 // max length of a geometry string
 
-#if defined(HAVE_QUANTUMOPERATORREGIONIMAGE) || defined(HAVE_EVALUATEIMAGECHANNEL)
 /*
  * Both ImageMagick and GraphicsMagick define an enum type for quantum-level
  * expressions, but they're different types. The QuantumExpressionOperator
@@ -178,87 +211,8 @@ typedef enum _QuantumExpressionOperator
     SubtractQuantumOperator,
     XorQuantumOperator
 } QuantumExpressionOperator ;
-#endif
-
-
-/*
-    ImageMagick used simply size_t and off_t in 5.5.1, then defined the
-    Extended(Un)SignedIntegralType from 5.5.2 thru 5.5.7. The 5.5.8 release
-    deprecates these types and uses Magick(Un)SignedType instead.
-    Prior to 1.1, GraphicsMagick defined the Extended(Un)SignedIntegralType(s).
-    GraphicsMagick 1.1. introduced the magick_(u)int64_t types.
-
-    Here, if we don't already have magick_(u)int64_t, define them in terms
-    of whatever other types are defined.
-*/
-#if !defined(HAVE_MAGICK_INT64_T)
-    #if defined(HAVE_MAGICKOFFSETTYPE)
-        typedef MagickOffsetType magick_int64_t;
-    #elif defined(HAVE_EXTENDEDSIGNEDINTEGRALTYPE)
-        typedef ExtendedSignedIntegralType magick_int64_t;
-    #else
-        typedef off_t magick_int64_t;
-    #endif
-#endif
-
-#if !defined(HAVE_MAGICK_UINT64_T)
-    #if defined(HAVE_MAGICKSIZETYPE)
-        typedef MagickSizeType magick_uint64_t;
-    #elif defined(HAVE_EXTENDEDUNSIGNEDINTEGRALTYPE)
-        typedef ExtendedUnsignedIntegralType magick_uint64_t;
-    #else
-        typedef size_t magick_uint64_t;
-    #endif
-#endif
-
-// IM < 6.2.0 and GM don't have MagickBooleanType
-#if !defined(HAVE_MAGICKBOOLEANTYPE)
-typedef unsigned int MagickBooleanType;
-#if !defined(MagickTrue)
-#define MagickTrue 1
-#endif
-#if !defined(MagickFalse)
-#define MagickFalse 0
-#endif
-#endif
-
-#if !defined(HAVE_UNDEFINEDGRAVITY)
-#define UndefinedGravity 0
-#endif
-
-#if !defined(HAVE_QUANTUMPIXEL)
-#if QuantumDepth == 8
-#define QuantumPixel CharPixel
-#else
-#define QuantumPixel ShortPixel
-#endif
-#endif
-
-#if !defined(HAVE_SETIMAGEINFOFILE)
-#define SetImageInfoFile(info, fptr) (info)->file = (fptr)
-#endif
-
-#if !defined(HAVE_REMOVEFIRSTIMAGEFROMLIST)
-#define RemoveFirstImageFromList(i) ShiftImageList(i)
-#endif
-
-#if !defined(HAVE_GETBLOBSIZE)
-#define GetBlobSize(i) SizeBlob(i)
-#endif
-
-#define ROUND_TO_QUANTUM(value) ((Quantum) ((value) > MaxRGB ? MaxRGB : (value) + 0.5))
-
-#if !defined(HAVE_SETIMAGEEXTENT)
-#define SetImageExtent(img, c, r) \
-    (img)->columns = (c); \
-    (img)->rows = (r)
-#endif
 
 
-#if !defined(HAVE_SETIMAGEBACKGROUNDCOLOR)
-#define SetImageBackgroundColor(img) SetImage((img), OpaqueOpacity)
-#endif
-
 // This implements the "omitted storage class model" for external variables.
 // (Ref: Harbison & Steele.) The rmmain.c file defines MAIN, which causes
 // the single defining declarations to be generated. No other source files
@@ -281,6 +235,7 @@ EXTERN VALUE Class_DrawOptions;
 EXTERN VALUE Class_Image;
 EXTERN VALUE Class_Montage;
 EXTERN VALUE Class_ImageMagickError;
+EXTERN VALUE Class_DestroyedImageError;
 EXTERN VALUE Class_GradientFill;
 EXTERN VALUE Class_TextureFill;
 EXTERN VALUE Class_AffineMatrix;
@@ -296,20 +251,13 @@ EXTERN VALUE Class_Primary;
 EXTERN VALUE Class_Rectangle;
 EXTERN VALUE Class_Segment;
 EXTERN VALUE Class_TypeMetric;
-#if defined(HAVE_COMPAREIMAGECHANNELS) || defined(HAVE_GETIMAGECHANNELDISTORTION)
 EXTERN VALUE Class_MetricType;
-#endif
-#if defined(HAVE_QUANTUMOPERATORREGIONIMAGE) || defined(HAVE_EVALUATEIMAGECHANNEL)
 EXTERN VALUE Class_QuantumExpressionOperator;
-#endif
-#if defined(HAVE_GETIMAGESTATISTICS)
-EXTERN VALUE Class_Statistics;
-EXTERN VALUE Class_StatisticsChannel;
-#endif
 
 // Enum classes
 EXTERN VALUE Class_Enum;
 EXTERN VALUE Class_AlignType;
+EXTERN VALUE Class_AlphaChannelType;
 EXTERN VALUE Class_AnchorType;
 EXTERN VALUE Class_ChannelType;
 EXTERN VALUE Class_ClassType;
@@ -319,21 +267,18 @@ EXTERN VALUE Class_CompositeOperator;
 EXTERN VALUE Class_CompressionType;
 EXTERN VALUE Class_DecorationType;
 EXTERN VALUE Class_DisposeType;
+#if defined(HAVE_DISTORTIMAGE)
+EXTERN VALUE Class_DistortImageMethod;
+#endif
 EXTERN VALUE Class_EndianType;
 EXTERN VALUE Class_FilterTypes;
 EXTERN VALUE Class_GravityType;
 EXTERN VALUE Class_ImageType;
 EXTERN VALUE Class_InterlaceType;
-#if defined(HAVE_INTERPOLATEPIXELCOLOR)
 EXTERN VALUE Class_InterpolatePixelMethod;
-#endif
-#if defined(HAVE_COMPAREIMAGELAYERS)
-EXTERN VALUE Class_MagickLayerMethod;
-#endif
+EXTERN VALUE CLASS_LAYERMETHODTYPE;
 EXTERN VALUE Class_NoiseType;
-#if defined(HAVE_IMAGE_ORIENTATION)
 EXTERN VALUE Class_OrientationType;
-#endif
 EXTERN VALUE Class_PaintMethod;
 EXTERN VALUE Class_PreviewType;
 EXTERN VALUE Class_RenderingIntent;
@@ -347,6 +292,7 @@ EXTERN VALUE Class_VirtualPixelMethod;
 /*
 *   Commonly-used IDs
 */
+EXTERN ID rm_ID_trace_proc;        // "@trace_proc"
 EXTERN ID rm_ID__dummy_img_;       // "_dummy_img_"
 EXTERN ID rm_ID_call;              // "call"
 EXTERN ID rm_ID_changed;           // "changed"
@@ -365,7 +311,8 @@ 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__tmpnam_;          // "_tmpnam"
+EXTERN ID rm_ID__tmpnam_;          // "_tmpnam_"
+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"
@@ -376,25 +323,11 @@ EXTERN ID rm_ID_y;                 // "y"
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
 
-#define Q(N) Q2(N)
-#define Q2(N) #N
-
 /*
    Handle warnings & errors
 */
 #define CHECK_EXCEPTION() rm_check_exception(&exception, NULL, RetainOnError);
 
-/*
-    Map the QuantumDepth to a StorageType.
-*/
-#if QuantumDepth == 8
-#define FIX_STG_TYPE CharPixel
-#elif QuantumDepth == 16
-#define FIX_STG_TYPE ShortPixel
-#else   // QuantumDepth == 32
-#define FIX_STG_TYPE LongPixel
-#endif
-
 
 /*
     Call rb_define_method for an attribute accessor method
@@ -429,6 +362,9 @@ EXTERN ID rm_ID_y;                 // "y"
     VALUE class##_##attr(VALUE self)\
     {\
         class *ptr;\
+        if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
+            (void) rm_check_destroyed(self); \
+        }\
         Data_Get_Struct(self, class, ptr);\
         return C_##type##_to_R_##type(ptr->attr);\
     }
@@ -438,6 +374,7 @@ EXTERN ID rm_ID_y;                 // "y"
     VALUE class##_##attr(VALUE self)\
     {\
         class *ptr;\
+        (void) rm_check_destroyed(self); \
         Data_Get_Struct(self, class, ptr);\
         return C_##type##_to_R_##type(ptr->field);\
     }
@@ -445,7 +382,10 @@ EXTERN ID rm_ID_y;                 // "y"
     VALUE class##_##attr##_eq(VALUE self, VALUE val)\
     {\
         class *ptr;\
-        rm_check_frozen(self);\
+        if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
+            (void) rm_check_destroyed(self); \
+        }\
+        rb_check_frozen(self);\
         Data_Get_Struct(self, class, ptr);\
         ptr->attr = R_##type##_to_C_##type(val);\
         return self;\
@@ -493,12 +433,12 @@ Pixel_##_channel_##_eq(VALUE self, VALUE v) \
 { \
     Pixel *pixel; \
  \
-    rm_check_frozen(self); \
+    rb_check_frozen(self); \
     Data_Get_Struct(self, Pixel, pixel); \
-    pixel->_channel_ = (Quantum) NUM2UINT(v); \
+    pixel->_channel_ = APP2QUANTUM(v); \
     (void) rb_funcall(self, rm_ID_changed, 0); \
     (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
-    return UINT2NUM((unsigned int)(pixel->_channel_)); \
+    return QUANTUM2NUM((pixel->_channel_)); \
 }
 
 
@@ -511,12 +451,12 @@ Pixel_##_cmyk_channel_##_eq(VALUE self, VALUE v) \
 { \
     Pixel *pixel; \
  \
-    rm_check_frozen(self); \
+    rb_check_frozen(self); \
     Data_Get_Struct(self, Pixel, pixel); \
-    pixel->_rgb_channel_ = (Quantum) NUM2UINT(v); \
+    pixel->_rgb_channel_ = APP2QUANTUM(v); \
     (void) rb_funcall(self, rm_ID_changed, 0); \
     (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
-    return UINT2NUM((unsigned int)pixel->_rgb_channel_); \
+    return QUANTUM2NUM(pixel->_rgb_channel_); \
 } \
  \
 extern VALUE \
@@ -544,7 +484,11 @@ Pixel_##_cmyk_channel_(VALUE self) \
 #define END_ENUM }
 
 //  Define a Magick module constant
-#define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, INT2FIX(constant))
+#if QuantumDepth == 64
+#define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, ULL2NUM(constant))
+#else   // QuantumDepth == 8, 16, 32
+#define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, UINT2NUM(constant))
+#endif
 
 
 // Convert a Ruby enum constant back to a C enum member.
@@ -576,6 +520,7 @@ ATTR_WRITER(Draw, decorate)
 ATTR_WRITER(Draw, density)
 ATTR_WRITER(Draw, encoding)
 ATTR_WRITER(Draw, fill)
+ATTR_WRITER(Draw, fill_pattern)
 ATTR_WRITER(Draw, font)
 ATTR_WRITER(Draw, font_family)
 ATTR_WRITER(Draw, font_stretch)
@@ -585,6 +530,7 @@ ATTR_WRITER(Draw, gravity)
 ATTR_WRITER(Draw, pointsize)
 ATTR_WRITER(Draw, rotation)
 ATTR_WRITER(Draw, stroke)
+ATTR_WRITER(Draw, stroke_pattern)
 ATTR_WRITER(Draw, stroke_width)
 ATTR_WRITER(Draw, text_antialias)
 ATTR_WRITER(Draw, tile)
@@ -599,13 +545,8 @@ 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);
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE Draw_alloc(VALUE);
 extern VALUE DrawOptions_alloc(VALUE);
-#else
-extern VALUE Draw_new(VALUE);
-extern VALUE DrawOptions_new(VALUE);
-#endif
 extern VALUE Draw_primitive(VALUE, VALUE);
 extern VALUE DrawOptions_initialize(VALUE);
 
@@ -628,21 +569,15 @@ ATTR_WRITER(Montage, texture)
 ATTR_WRITER(Montage, tile)
 ATTR_WRITER(Montage, title)
 extern VALUE Montage_initialize(VALUE);
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE Montage_alloc(VALUE);
-#else
-extern VALUE Montage_new(VALUE);
-#endif
 extern VALUE rm_montage_new(void);
 
 
 extern VALUE PolaroidOptions_alloc(VALUE);
-#if !defined(HAVE_RB_DEFINE_ALLOC_FUNC)
-extern VALUE PolaroidOptions_new(VALUE);
-#endif
 extern VALUE PolaroidOptions_initialize(VALUE);
 extern VALUE rm_polaroid_new(void);
 ATTR_WRITER(PolaroidOptions, shadow_color);
+ATTR_WRITER(PolaroidOptions, border_color);
 
 
 // rmmain.c
@@ -654,6 +589,7 @@ 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_composite_layers(int, VALUE *, VALUE);
 extern VALUE ImageList_deconstruct(VALUE);
 extern VALUE ImageList_display(VALUE);
 extern VALUE ImageList_flatten_images(VALUE);
@@ -667,16 +603,12 @@ extern VALUE ImageList_quantize(int, VALUE*, VALUE);
 extern VALUE ImageList_to_blob(VALUE);
 extern VALUE ImageList_write(VALUE, VALUE);
 
-extern VALUE rm_imagelist_new(void);
 extern VALUE rm_imagelist_from_images(Image *);
-extern Image *rm_images_from_imagelist(VALUE);
-extern VALUE rm_imagelist_scene_eq(VALUE, VALUE);
-extern int rm_imagelist_length(VALUE);
-extern void rm_imagelist_push(VALUE, VALUE);
 
 
 // rminfo.c
 ATTR_ACCESSOR(Info, antialias)
+ATTR_ACCESSOR(Info, attenuate)
 ATTR_ACCESSOR(Info, authenticate)
 ATTR_ACCESSOR(Info, background_color)
 ATTR_ACCESSOR(Info, border_color)
@@ -713,24 +645,21 @@ ATTR_ACCESSOR(Info, quality)
 ATTR_ACCESSOR(Info, sampling_factor)
 ATTR_ACCESSOR(Info, scene)
 ATTR_ACCESSOR(Info, server_name)
-ATTR_ACCESSOR(Info, subimage)
-ATTR_ACCESSOR(Info, subrange)
-ATTR_WRITER(Info, texture)
-ATTR_ACCESSOR(Info, tile)
 ATTR_ACCESSOR(Info, size)
+ATTR_ACCESSOR(Info, stroke)
+ATTR_ACCESSOR(Info, stroke_width)
+ATTR_WRITER(Info, texture)
+ATTR_ACCESSOR(Info, tile_offset)
+ATTR_ACCESSOR(Info, undercolor)
 ATTR_ACCESSOR(Info, units)
 ATTR_ACCESSOR(Info, view)
 //ATTR_ACCESSOR(Info, verbose)
 
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE Info_alloc(VALUE);
-#else
-extern VALUE Info_new(VALUE);
-#endif
 
 extern VALUE Info_define(int, VALUE *, VALUE);
-extern VALUE Info_aset(VALUE, VALUE, VALUE, VALUE);
-extern VALUE Info_aref(VALUE, VALUE, VALUE);
+extern VALUE Info_aset(int, VALUE *, VALUE);
+extern VALUE Info_aref(int, VALUE *, VALUE);
 extern VALUE Info_channel(int, VALUE *, VALUE);
 extern VALUE Info_undefine(VALUE, VALUE, VALUE);
 extern VALUE Info_initialize(VALUE);
@@ -738,6 +667,7 @@ extern VALUE rm_info_new(void);
 
 
 // rmimage.c
+ATTR_WRITER(Image, alpha)
 ATTR_ACCESSOR(Image, background_color)
 ATTR_READER(Image, base_columns)
 ATTR_READER(Image, base_filename)
@@ -769,7 +699,8 @@ ATTR_ACCESSOR(Image, format)
 ATTR_ACCESSOR(Image, fuzz)
 ATTR_ACCESSOR(Image, gamma)
 ATTR_ACCESSOR(Image, geometry)
-ATTR_ACCESSOR(Image, image_type)
+ATTR_ACCESSOR(Image, gravity)
+ATTR_READER(Image, image_type)
 ATTR_ACCESSOR(Image, interlace)
 ATTR_ACCESSOR(Image, iptc_profile)
 ATTR_ACCESSOR(Image, iterations)
@@ -779,7 +710,7 @@ ATTR_ACCESSOR(Image, matte_color)
 ATTR_READER(Image, mean_error_per_pixel)
 ATTR_READER(Image, mime_type)
 ATTR_WRITER(Image, monitor)
-ATTR_ACCESSOR(Image, montage)
+ATTR_READER(Image, montage)
 ATTR_READER(Image, normalized_mean_error)
 ATTR_READER(Image, normalized_maximum_error)
 ATTR_READER(Image, number_colors)
@@ -795,7 +726,6 @@ ATTR_READER(Image, rows)
 ATTR_READER(Image, scene)
 ATTR_ACCESSOR(Image, start_loop)
 ATTR_ACCESSOR(Image, ticks_per_second)
-ATTR_ACCESSOR(Image, tile_info)
 ATTR_READER(Image, total_colors)
 ATTR_ACCESSOR(Image, transparent_color)
 ATTR_ACCESSOR(Image, units)
@@ -806,14 +736,8 @@ ATTR_ACCESSOR(Image, y_resolution)
 extern ChannelType extract_channels(int *, VALUE *);
 extern void raise_ChannelType_error(VALUE);
 
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE Image_alloc(VALUE);
 extern VALUE Image_initialize(int, VALUE *, VALUE);
-#else
-extern VALUE Image_new(int, VALUE *, VALUE);
-extern VALUE Image_initialize(VALUE, VALUE, VALUE, VALUE, VALUE);
-#endif
-
 extern VALUE Image_adaptive_blur(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_blur_channel(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_resize(int, VALUE *, VALUE);
@@ -840,18 +764,20 @@ extern VALUE Image_capture(int, VALUE *, VALUE);
 extern VALUE Image_change_geometry(VALUE, VALUE);
 extern VALUE Image_changed_q(VALUE);
 extern VALUE Image_channel(VALUE, VALUE);
+extern VALUE Image_check_destroyed(VALUE);
 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);
-extern VALUE Image_channel_threshold(int, VALUE *, VALUE);
 extern VALUE Image_charcoal(int, VALUE *, VALUE);
 extern VALUE Image_chop(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_clone(VALUE);
+extern VALUE Image_clut_channel(int, VALUE *, VALUE);
 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_bang(int, VALUE *, VALUE);
 extern VALUE Image_composite_channel(int, VALUE *, VALUE);
@@ -869,11 +795,14 @@ extern VALUE Image_crop_bang(int, VALUE *, VALUE);
 extern VALUE Image_cycle_colormap(VALUE, VALUE);
 extern VALUE Image_delete_profile(VALUE, VALUE);
 extern VALUE Image_despeckle(VALUE);
+extern VALUE Image_destroy_bang(VALUE);
+extern VALUE Image_destroyed_q(VALUE);
 extern VALUE Image_difference(VALUE, VALUE);
 extern VALUE Image_dispatch(int, VALUE *, VALUE);
 extern VALUE Image_displace(int, VALUE *, VALUE);
 extern VALUE Image_display(VALUE);
 extern VALUE Image_dissolve(int, VALUE *, VALUE);
+extern VALUE Image_distort(int, VALUE *, VALUE);
 extern VALUE Image_distortion_channel(int, VALUE *, VALUE);
 extern VALUE Image__dump(VALUE, VALUE);
 extern VALUE Image_dup(VALUE);
@@ -882,9 +811,13 @@ extern VALUE Image_edge(int, VALUE *, VALUE);
 extern VALUE Image_emboss(int, VALUE *, VALUE);
 extern VALUE Image_enhance(VALUE);
 extern VALUE Image_equalize(VALUE);
+extern VALUE Image_equalize_channel(int, VALUE *, VALUE);
 extern VALUE Image_erase_bang(VALUE);
+extern VALUE Image_excerpt(VALUE, VALUE, VALUE, VALUE, VALUE);
+extern VALUE Image_excerpt_bang(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_export_pixels(int, VALUE *, VALUE);
 extern VALUE Image_export_pixels_to_str(int, VALUE *, VALUE);
+extern VALUE Image_extent(int, VALUE *, VALUE);
 extern VALUE Image_find_similar_region(int, VALUE *, VALUE);
 extern VALUE Image_flip(VALUE);
 extern VALUE Image_flip_bang(VALUE);
@@ -898,7 +831,7 @@ extern VALUE Image_gaussian_blur(int, VALUE *, VALUE);
 extern VALUE Image_gaussian_blur_channel(int, VALUE *, VALUE);
 extern VALUE Image_get_pixels(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_gray_q(VALUE);
-extern VALUE Image_grayscale_pseudo_class(int, VALUE *, VALUE);
+extern VALUE Image_histogram_q(VALUE);
 extern VALUE Image_implode(int, VALUE *, VALUE);
 extern VALUE Image_import_pixels(int, VALUE *, VALUE);
 extern VALUE Image_init_copy(VALUE, VALUE);
@@ -938,7 +871,6 @@ extern VALUE Image_quantum_operator(int, VALUE *, VALUE);
 extern VALUE Image_radial_blur(VALUE, VALUE);
 extern VALUE Image_radial_blur_channel(int, VALUE *, VALUE);
 extern VALUE Image_raise(int, VALUE *, VALUE);
-extern VALUE Image_random_channel_threshold(VALUE, VALUE, VALUE);
 extern VALUE Image_random_threshold_channel(int, VALUE *, VALUE);
 extern VALUE Image_read(VALUE, VALUE);
 extern VALUE Image_read_inline(VALUE, VALUE);
@@ -954,6 +886,7 @@ extern VALUE Image_sample_bang(int, VALUE *, VALUE);
 extern VALUE Image_scale(int, VALUE *, VALUE);
 extern VALUE Image_scale_bang(int, VALUE *, VALUE);
 extern VALUE Image_segment(int, VALUE *, VALUE);
+extern VALUE Image_separate(int, VALUE *, VALUE);
 extern VALUE Image_sepiatone(int, VALUE *, VALUE);
 extern VALUE Image_set_channel_depth(VALUE, VALUE, VALUE);
 extern VALUE Image_shade(int, VALUE *, VALUE);
@@ -970,12 +903,12 @@ extern VALUE Image_solarize(int, VALUE *, VALUE);
 extern VALUE Image_spaceship(VALUE, VALUE);
 extern VALUE Image_splice(int, VALUE *, VALUE);
 extern VALUE Image_spread(int, VALUE *, VALUE);
-extern VALUE Image_statistics(VALUE);
 extern VALUE Image_stegano(VALUE, VALUE, VALUE);
 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);
@@ -988,8 +921,8 @@ extern VALUE Image_transpose(VALUE);
 extern VALUE Image_transpose_bang(VALUE);
 extern VALUE Image_transverse(VALUE);
 extern VALUE Image_transverse_bang(VALUE);
-extern VALUE Image_trim(VALUE);
-extern VALUE Image_trim_bang(VALUE);
+extern VALUE Image_trim(int, VALUE *, VALUE);
+extern VALUE Image_trim_bang(int, VALUE *, VALUE);
 extern VALUE Image_unique_colors(VALUE);
 extern VALUE Image_unsharp_mask(int, VALUE *, VALUE);
 extern VALUE Image_unsharp_mask_channel(int, VALUE *, VALUE);
@@ -1001,24 +934,16 @@ extern VALUE Image_white_threshold(int, VALUE *, VALUE);
 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
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE  GradientFill_alloc(VALUE);
-#else
-extern VALUE  GradientFill_new(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
-#endif
-
 extern VALUE  GradientFill_initialize(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE  GradientFill_fill(VALUE, VALUE);
 
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE  TextureFill_alloc(VALUE);
-#else
-extern VALUE  TextureFill_new(VALUE, VALUE);
-#endif
-
 extern VALUE  TextureFill_initialize(VALUE, VALUE);
 extern VALUE  TextureFill_fill(VALUE, VALUE);
 
@@ -1036,17 +961,15 @@ 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  ImageList_cur_image(VALUE);
 extern VALUE  ImageMagickError_initialize(int, VALUE *, VALUE);
 extern VALUE  ImageType_new(ImageType);
 extern VALUE  InterlaceType_new(InterlaceType);
 
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE   Pixel_alloc(VALUE);
-#else
-extern VALUE   Pixel_new(int, VALUE *, VALUE);
-#endif
+
 ATTR_ACCESSOR(Pixel, red)
 ATTR_ACCESSOR(Pixel, green)
 ATTR_ACCESSOR(Pixel, blue)
@@ -1087,12 +1010,8 @@ 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);
-#if defined(HAVE_INTERPOLATEPIXELCOLOR)
 extern VALUE  InterpolatePixelMethod_new(InterpolatePixelMethod);
-#endif
-#if defined(HAVE_IMAGE_ORIENTATION)
 extern VALUE  OrientationType_new(OrientationType);
-#endif
 extern void   PrimaryInfo_to_PrimaryInfo(PrimaryInfo *, VALUE);
 extern void   Rectangle_to_RectangleInfo(RectangleInfo *, VALUE);
 extern void   Segment_to_SegmentInfo(SegmentInfo *, VALUE);
@@ -1101,17 +1020,10 @@ extern void   TypeMetric_to_TypeMetric(TypeMetric *, VALUE);
 extern VALUE  Font_from_TypeInfo(TypeInfo *);
 extern VALUE  TypeMetric_to_s(VALUE);
 extern VALUE  TypeMetric_from_TypeMetric(TypeMetric *);
-#if defined(HAVE_GETIMAGESTATISTICS)
-extern VALUE  Statistics_new(ImageStatistics *);
-#endif
 extern const char *StorageType_name(StorageType);
 extern VALUE  VirtualPixelMethod_new(VirtualPixelMethod);
 
-#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE  Enum_alloc(VALUE);
-#else
-extern VALUE  Enum_new(VALUE, VALUE, VALUE);
-#endif
 extern VALUE  Enum_initialize(VALUE, VALUE, VALUE);
 extern VALUE  Enum_to_s(VALUE);
 extern VALUE  Enum_to_i(VALUE);
@@ -1122,8 +1034,10 @@ extern VALUE  Enum_type_each(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 *, 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_no_freeze(VALUE);
@@ -1134,9 +1048,11 @@ extern char  *rm_string_value_ptr_len(volatile VALUE *, long *);
 extern int    rm_strcasecmp(const char *, const char *);
 extern int    rm_strncasecmp(const char *, const char *, size_t);
 extern void   rm_check_ary_len(VALUE, long);
-extern void   rm_check_frozen(VALUE);
+extern Image *rm_check_destroyed(VALUE);
+extern Image *rm_check_frozen_image(VALUE);
 extern int    rm_check_num2dbl(VALUE);
 extern double rm_fuzz_to_dbl(VALUE);
+extern Quantum rm_app2quantum(VALUE);
 extern double rm_percentage(VALUE);
 extern double rm_str_to_pct(VALUE);
 extern VALUE  rm_define_enum_type(char *);
@@ -1146,7 +1062,7 @@ extern void   rm_not_implemented(void);
 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 unsigned int rm_set_property(Image *, const char *, const char *);
+extern MagickBooleanType rm_set_property(Image *, const char *, const char *);
 extern void   rm_split(Image *);
 extern void   rm_magick_error(const char *, const char *);
 
@@ -1160,9 +1076,7 @@ extern void   rm_check_image_exception(Image *, ErrorRetention);
 extern void   rm_check_exception(ExceptionInfo *, Image *, ErrorRetention);
 extern void   rm_ensure_result(Image *);
 extern Image *rm_clone_image(Image *);
-#if defined(HAVE_SETIMAGEPROGRESSMONITOR)
 extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetType, const MagickSizeType, void *);
-#endif
 extern VALUE  rm_exif_by_entry(Image *);
 extern VALUE  rm_exif_by_number(Image *);