rmagick 3.2.0 → 4.3.0

data/ext/RMagick/rmagick.h

@@ -25,6 +25,33 @@
 #include "ruby.h"
 #include "ruby/io.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
+    // Use constants defined in Ruby
+    #define RMIuSIZE  PRIuSIZE
+    #define RMIdSIZE  PRIdSIZE
+    #define RMIsVALUE PRIsVALUE
+#endif
+
+#if defined(__GNUC__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+    #pragma GCC diagnostic ignored "-Wunknown-pragmas"
+
+    #if __GNUC__ > 6
+        #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+    #endif
+#endif
 
 // Undef Ruby's versions of these symbols
 #undef PACKAGE_VERSION
@@ -34,25 +61,31 @@
 #undef PACKAGE_TARNAME
 #undef WORDS_BIGENDIAN
 
-#include "magick/MagickCore.h"
-#include "magick/magick-config.h"
+#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
 
 // Undef ImageMagick's versions of these symbols
 #undef PACKAGE_STRING
 
 
-#include "extconf.h"
-
-
 //! For quoting preprocessor symbols
 #define Q2(q) #q
 //! For quoting preprocessor symbols
 #define Q(q) Q2(q)
 
 #ifdef __GNUC__
-#define ATTRIBUTE_UNUSED  __attribute__((unused))
+#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
@@ -86,11 +119,11 @@
 #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 */
 
@@ -107,24 +140,52 @@
  */
 #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;
 
 
 #define MagickLibSubversion MagickLibAddendum
 
-
 typedef ImageInfo Info; /**< Make type name match class name */
-typedef PixelPacket Pixel; /**< Make type name match class name */
-typedef MagickPixelPacket MagickPixel;
-typedef PixelPacket PixelColor;
-typedef AlphaChannelType AlphaChannelOption;
-typedef DistortImageMethod DistortMethod;
-typedef FilterTypes FilterType;
-typedef InterpolatePixelMethod PixelInterpolateMethod;
-typedef ImageLayerMethod LayerMethod;
-#define TransparentAlpha 0
+#if defined(IMAGEMAGICK_7)
+    typedef struct _QuantumPixelPacket
+    {
+    Quantum
+        red,
+        green,
+        blue,
+        alpha,
+        black;
+    } QuantumPixelPacket;
+
+    typedef QuantumPixelPacket Pixel;
+    typedef PixelInfo MagickPixel;
+    typedef PixelInfo PixelColor;
+#else
+    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
 
 //! Montage
 typedef struct
@@ -234,6 +295,7 @@ typedef enum _QuantumExpressionOperator
     PoissonNoiseQuantumOperator, /**< poisson noise */
     UniformNoiseQuantumOperator, /**< uniform noise */
     CosineQuantumOperator,    /**< cosine */
+    SetQuantumOperator,       /**< set */
     SineQuantumOperator,      /**< sine */
     AddModulusQuantumOperator, /**< add modulus */
     MeanQuantumOperator, /**< mean */
@@ -340,100 +402,72 @@ 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 unsigned long long rm_main_thread_id;
 
 #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) 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_ATTR_READER(class, attr, type) \
     {\
         class *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);\
         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_ATTR_READERF(class, attr, field, type) \
     {\
         class *ptr;\
-        (void) rm_check_destroyed(self); \
+        rm_check_destroyed(self); \
         Data_Get_Struct(self, class, 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_ATTR_WRITER(class, attr, type) \
     {\
         class *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);\
@@ -442,12 +476,11 @@ EXTERN ID rm_ID_y;                 /**< "y" */
     }
 
 //! define attribute writer when attribute name is different from the field name
-#define DEF_ATTR_WRITERF(class, attr, field, type) \
-    VALUE class##_##attr##_eq(VALUE self, VALUE val)\
+#define IMPLEMENT_ATTR_WRITERF(class, attr, field, type) \
     {\
         class *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);\
@@ -455,15 +488,6 @@ EXTERN ID rm_ID_y;                 /**< "y" */
         return self;\
     }
 
-//! define attribute accessor
-#define DEF_ATTR_ACCESSOR(class, attr, type)\
-    DEF_ATTR_READER(class, attr, type)\
-    DEF_ATTR_WRITER(class, attr, type)
-
-//! define attribute accessor when attribute name is different from the field name
-#define DEF_ATTR_ACCESSORF(class, attr, field, type)\
-    DEF_ATTR_READERF(class, attr, field, type)\
-    DEF_ATTR_WRITERF(class, attr, field, type)
 
 /*
  *  Declare attribute accessors
@@ -495,8 +519,8 @@ EXTERN ID rm_ID_y;                 /**< "y" */
    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)));\
+       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);\
    e = (type)(magick_enum->val);\
    } while(0)
@@ -607,8 +631,6 @@ 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);
@@ -645,7 +667,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)
@@ -689,9 +710,7 @@ extern GravityType rm_gravity_to_enum(const char *);
 extern VALUE KernelInfo_alloc(VALUE);
 
 extern VALUE KernelInfo_initialize(VALUE, VALUE);
-extern VALUE KernelInfo_zero_nans(VALUE);
 extern VALUE KernelInfo_unity_add(VALUE, VALUE);
-extern VALUE KernelInfo_show(VALUE);
 extern VALUE KernelInfo_scale(VALUE, VALUE, VALUE);
 extern VALUE KernelInfo_scale_geometry(VALUE, VALUE);
 extern VALUE KernelInfo_clone(VALUE);
@@ -700,14 +719,12 @@ extern VALUE KernelInfo_builtin(VALUE, VALUE, VALUE);
 
 
 // rmimage.c
-ATTR_WRITER(Image, alpha)
 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)
@@ -737,8 +754,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)
@@ -748,7 +763,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)
@@ -768,7 +782,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);
@@ -810,7 +824,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);
@@ -819,7 +837,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);
@@ -899,7 +916,6 @@ 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);
@@ -975,7 +991,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);
@@ -1024,7 +1039,6 @@ ATTR_ACCESSOR(Pixel, red)
 ATTR_ACCESSOR(Pixel, green)
 ATTR_ACCESSOR(Pixel, blue)
 ATTR_ACCESSOR(Pixel, alpha)
-ATTR_ACCESSOR(Pixel, opacity)
 ATTR_ACCESSOR(Pixel, cyan)
 ATTR_ACCESSOR(Pixel, magenta)
 ATTR_ACCESSOR(Pixel, yellow)
@@ -1037,7 +1051,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);
@@ -1047,7 +1060,6 @@ 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);
 
@@ -1093,6 +1105,7 @@ extern VALUE  ChromaticityInfo_to_s(VALUE);
 extern VALUE  ChromaticityInfo_new(ChromaticityInfo *);
 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  Font_to_s(VALUE);
@@ -1127,7 +1140,6 @@ 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 *);
@@ -1136,32 +1148,34 @@ 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);
+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 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_percentage(VALUE, double);
 extern double rm_str_to_pct(VALUE);
 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 *);
 extern void   rm_sync_image_options(Image *, Info *);
 extern void   rm_split(Image *);
 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
@@ -1176,7 +1190,6 @@ typedef enum
     DestroyExceptionRetention
 } ExceptionRetention;
 
-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 *);
@@ -1184,10 +1197,15 @@ extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetTyp
 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 unsigned long long rm_current_thread_id();
+#if defined(IMAGEMAGICK_6)
+extern void   rm_check_image_exception(Image *, ErrorRetention);
+#endif
+
 #endif