rmagick 4.1.0.rc2 → 4.2.1

data/ext/RMagick/rmagick.c

@@ -14,6 +14,7 @@
 
 
 
+static VALUE rm_yield_handle_exception(VALUE, VALUE) ATTRIBUTE_NORETURN;
 
 static VALUE
 rm_yield_body(VALUE object)
@@ -26,22 +27,19 @@ rm_yield_handle_exception(VALUE allocated_area, VALUE exc)
 {
     magick_free((void *)allocated_area);
     rb_exc_raise(exc);
-    return Qnil; /* not reachable */
 }
 
 /**
  * If called with the optional block, iterates over the colors, otherwise
- * returns an array of Magick::Color objects.
+ * returns an array of {Magick::Color} objects.
  *
- * Ruby usage:
- *   - @verbatim Magick::colors @endverbatim
- *   - @verbatim Magick::colors { |colorinfo| } @endverbatim
+ * @overload colors
+ *   @return [Array<Magick::Color>] the array of {Magick::Color}
  *
- * Notes:
- *   - There are 3 implementations.
+ * @overload colors
+ *   @yield [colorinfo]
+ *   @yieldparam colorinfo [Magick::Color] the color
  *
- * @param class the class on which the method is run.
- * @return either the input class (if a block was given) or the array of colors.
  */
 VALUE
 Magick_colors(VALUE class)
@@ -54,8 +52,8 @@ Magick_colors(VALUE class)
     exception = AcquireExceptionInfo();
 
     color_info_list = GetColorInfoList("*", &number_colors, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
 
     if (rb_block_given_p())
@@ -72,7 +70,7 @@ Magick_colors(VALUE class)
         ary = rb_ary_new2((long) number_colors);
         for (x = 0; x < number_colors; x++)
         {
-            (void) rb_ary_push(ary, Import_ColorInfo(color_info_list[x]));
+            rb_ary_push(ary, Import_ColorInfo(color_info_list[x]));
         }
 
         magick_free((void *)color_info_list);
@@ -84,14 +82,15 @@ Magick_colors(VALUE class)
 
 /**
  * If called with the optional block, iterates over the fonts, otherwise returns
- * an array of Magick::Font objects.
+ * an array of {Magick::Font} objects.
  *
- * Ruby usage:
- *   - @verbatim Magick::fonts @endverbatim
- *   - @verbatim Magick::fonts { |fontinfo| } @endverbatim
+ * @overload fonts
+ *   @return [Array<Magick::Font>] the array of {Magick::Font}
+ *
+ * @overload fonts
+ *   @yield [fontinfo]
+ *   @yieldparam fontinfo [Magick::Font] the font
  *
- * @param class the class on which the method is run.
- * @return either the input class (if a block was given) or the array of fonts.
  */
 VALUE
 Magick_fonts(VALUE class)
@@ -103,8 +102,8 @@ Magick_fonts(VALUE class)
 
     exception = AcquireExceptionInfo();
     type_info = GetTypeInfoList("*", &number_types, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
     if (rb_block_given_p())
     {
@@ -120,7 +119,7 @@ Magick_fonts(VALUE class)
         ary = rb_ary_new2((long)number_types);
         for (x = 0; x < number_types; x++)
         {
-            (void) rb_ary_push(ary, Import_TypeInfo((const TypeInfo *)type_info[x]));
+            rb_ary_push(ary, Import_TypeInfo((const TypeInfo *)type_info[x]));
         }
         magick_free((void *)type_info);
         RB_GC_GUARD(ary);
@@ -138,7 +137,7 @@ Magick_fonts(VALUE class)
  *   - "R" is "r" if ImageMagick can read that format, or "-" otherwise.
  *   - "W" is "w" if ImageMagick can write that format, or "-" otherwise.
  *   - "A" is "+" if the format supports multi-image files, or "-" otherwise.
- * 
+ *
  * No Ruby usage (internal function)
  *
  * @param magick_info a MagickInfo object.
@@ -162,21 +161,13 @@ MagickInfo_to_format(const MagickInfo *magick_info)
  * Build the @@formats hash. The hash keys are image formats. The hash values
  * specify the format "mode string", i.e. a description of what ImageMagick can
  * do with that format. The mode string is in the form "BRWA", where
- *   - "B" is "*" if the format has native blob support, or " " otherwise.
- *   - "R" is "r" if ImageMagick can read that format, or "-" otherwise.
- *   - "W" is "w" if ImageMagick can write that format, or "-" otherwise.
- *   - "A" is "+" if the format supports multi-image files, or "-" otherwise.
- * 
- * Ruby usage:
- *   - @verbatim Magick.init_formats @endverbatim
  *
- * Notes:
- *   - Only called once.
- *   - There are 3 implementations.
+ * - "B" is "*" if the format has native blob support, or " " otherwise.
+ * - "R" is "r" if ImageMagick can read that format, or "-" otherwise.
+ * - "W" is "w" if ImageMagick can write that format, or "-" otherwise.
+ * - "A" is "+" if the format supports multi-image files, or "-" otherwise.
  *
- * @param class the class on which the method is run.
- * @return the formats hash.
- * @see MagickInfo_to_format
+ * @return [Hash] the formats hash.
  */
 VALUE
 Magick_init_formats(VALUE class ATTRIBUTE_UNUSED)
@@ -191,15 +182,15 @@ Magick_init_formats(VALUE class ATTRIBUTE_UNUSED)
     // IM 6.1.3 added an exception argument to GetMagickInfoList
     exception = AcquireExceptionInfo();
     magick_info = GetMagickInfoList("*", &number_formats, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
 
     for (x = 0; x < number_formats; x++)
     {
-        (void) rb_hash_aset(formats
-                            , rb_str_new2(magick_info[x]->name)
-                            , MagickInfo_to_format((const MagickInfo *)magick_info[x]));
+        rb_hash_aset(formats,
+                     rb_str_new2(magick_info[x]->name),
+                     MagickInfo_to_format((const MagickInfo *)magick_info[x]));
     }
     magick_free((void *)magick_info);
     RB_GC_GUARD(formats);
@@ -211,14 +202,16 @@ Magick_init_formats(VALUE class ATTRIBUTE_UNUSED)
  * Get/set resource limits. If a limit is specified the old limit is set to the
  * new value. Either way the current/old limit is returned.
  *
- * Ruby usage:
- *   - @verbatim Magick.limit_resource(resource) @endverbatim
- *   - @verbatim Magick.limit_resource(resource, limit) @endverbatim
+ * @overload limit_resource(resource)
+ *   Get resource limits.
+ *   @param resource [String, Symbol] the type of resource
  *
- * @param argc number of input arguments.
- * @param argv array of input arguments.
- * @param class the class on which the method is run.
- * @return the current/old limit.
+ * @overload limit_resource(resource, limit)
+ *   Set resource limits.
+ *   @param resource [String, Symbol] the type of resource
+ *   @param limit [Numeric] the new limit number
+ * 
+ * @return [Numeric] the old limit.
  */
 VALUE
 Magick_limit_resource(int argc, VALUE *argv, VALUE class)
@@ -269,7 +262,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             break;
 
         default:
-            str = StringValuePtr(resource);
+            str = StringValueCStr(resource);
             if (*str == '\0')
             {
                 return class;
@@ -311,7 +304,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
 
     if (argc > 1)
     {
-        (void) SetMagickResourceLimit(res, (MagickSizeType)NUM2ULONG(limit));
+        SetMagickResourceLimit(res, (MagickSizeType)NUM2ULONG(limit));
     }
 
     RB_GC_GUARD(limit);
@@ -325,22 +318,14 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
  * threshold is exceeded, all subsequent pixels cache operations are to/from
  * disk.
  *
- * Ruby usage:
- *   - @verbatim Magick.set_cache_threshold(megabytes) @endverbatim
- *
- * Notes:
- *   - singleton method
- *
- * @param class the class on which the method is run.
- * @param threshold the number of megabytes to set.
- * @return the class.
+ * @param threshold [Numeric] the number of megabytes to set.
  */
 VALUE
 Magick_set_cache_threshold(VALUE class, VALUE threshold)
 {
     unsigned long thrshld = NUM2ULONG(threshold);
-    (void) SetMagickResourceLimit(MemoryResource, (MagickSizeType)thrshld);
-    (void) SetMagickResourceLimit(MapResource, (MagickSizeType)(2*thrshld));
+    SetMagickResourceLimit(MemoryResource, (MagickSizeType)thrshld);
+    SetMagickResourceLimit(MapResource, (MagickSizeType)(2*thrshld));
     return class;
 }
 
@@ -348,32 +333,25 @@ Magick_set_cache_threshold(VALUE class, VALUE threshold)
 /**
  * Set the log event mask.
  *
- * Ruby usage:
- *   - @verbatim Magick.set_log_event_mask(event) @endverbatim
- *   - @verbatim Magick.set_log_event_mask(event,...) @endverbatim
+ * The arguments are one of:
  *
- * Notes:
- *   - "event" is one of
- *     - "all"
- *     - "annotate"
- *     - "blob"
- *     - "cache"
- *     - "coder"
- *     - "configure"
- *     - "deprecate"
- *     - "locale"
- *     - "none"
- *     - "render"
- *     - "transform"
- *     - "user"
- *     - "x11"
- *   - Multiple events can be specified.
- *   - Event names may be capitalized.
+ * - "all"
+ * - "annotate"
+ * - "blob"
+ * - "cache"
+ * - "coder"
+ * - "configure"
+ * - "deprecate"
+ * - "locale"
+ * - "none"
+ * - "render"
+ * - "transform"
+ * - "user"
+ * - "x11"
  *
- * @param argc number of input arguments.
- * @param argv array of input arguments.
- * @param class the class on which the method is run.
- * @return the class.
+ * Multiple events can be specified as the aruments. Event names may be capitalized.
+ *
+ * @param args [String] the mask of log event.
  */
 VALUE
 Magick_set_log_event_mask(int argc, VALUE *argv, VALUE class)
@@ -386,38 +364,33 @@ Magick_set_log_event_mask(int argc, VALUE *argv, VALUE class)
     }
     for (x = 0; x < argc; x++)
     {
-        (void) SetLogEventMask(StringValuePtr(argv[x]));
+        SetLogEventMask(StringValueCStr(argv[x]));
     }
     return class;
 }
 
 /**
  * Set the format for log messages.
- * 
- * Ruby usage:
- *   - @verbatim Magick.set_log_format(format) @endverbatim
  *
- * Notes:
- *   - Format is a string containing one or more of:
- *     - %t  - current time
- *     - %r  - elapsed time
- *     - %u  - user time
- *     - %p  - pid
- *     - %m  - module (source file name)
- *     - %f  - function name
- *     - %l  - line number
- *     - %d  - event domain (one of the events listed above)
- *     - %e  - event name
- *     - Plus other characters, including \\n, etc.
+ * Format is a string containing one or more of:
+ *
+ * - %t  - current time
+ * - %r  - elapsed time
+ * - %u  - user time
+ * - %p  - pid
+ * - %m  - module (source file name)
+ * - %f  - function name
+ * - %l  - line number
+ * - %d  - event domain (one of the events listed above)
+ * - %e  - event name
+ * - Plus other characters, including \\n, etc.
  *
- * @param class the class on which the method is run.
- * @param format the format to set.
- * @return the class.
+ * @param format [String] the format to set.
  */
 VALUE
 Magick_set_log_format(VALUE class, VALUE format)
 {
-    SetLogFormat(StringValuePtr(format));
+    SetLogFormat(StringValueCStr(format));
     return class;
 }
 

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
@@ -54,9 +81,11 @@
 #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
@@ -90,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 */
 
@@ -111,7 +140,10 @@
  */
 #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;
 
@@ -134,7 +166,16 @@ typedef ImageInfo Info; /**< Make type name match class name */
     typedef PixelInfo MagickPixel;
     typedef PixelInfo PixelColor;
 #else
-    typedef PixelPacket Pixel;
+    typedef struct _RMagickPixelPacket
+    {
+    Quantum
+        red,
+        green,
+        blue,
+        opacity,
+        black;
+    } RMagickPixelPacket;
+    typedef RMagickPixelPacket Pixel;
     typedef MagickPixelPacket MagickPixel;
     typedef PixelPacket PixelColor;
     typedef AlphaChannelType AlphaChannelOption;
@@ -361,61 +402,36 @@ 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 */
@@ -427,34 +443,31 @@ EXTERN ID rm_ID_y;                 /**< "y" */
 #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);\
@@ -463,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);\
@@ -476,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
@@ -516,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)
@@ -779,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);
@@ -821,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);
@@ -1098,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);
@@ -1132,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 *);
@@ -1141,26 +1148,25 @@ 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 *);
@@ -1188,11 +1194,12 @@ 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