rmagick 5.3.0 → 5.4.0

data/ext/RMagick/rmagick.h

@@ -16,15 +16,21 @@
 //! Suppress warnings about deprecated functions on Windows
 #define _CRT_SECURE_NO_DEPRECATE 1
 
-#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"
+// 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.
@@ -45,10 +51,6 @@
 #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
@@ -316,7 +318,7 @@ typedef enum _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.
  */
@@ -442,7 +444,7 @@ extern const rb_data_type_t rm_kernel_info_data_type;
     Define simple attribute accessor methods (boolean, int, string, and double types)
 */
 #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 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) LONG2NUM(attr) /**< C long -> Ruby long */
@@ -454,47 +456,47 @@ extern const rb_data_type_t rm_kernel_info_data_type;
 #define R_dbl_to_C_dbl(attr) NUM2DBL(attr) /**< C double <- Ruby double */
 
 //! define attribute reader
-#define IMPLEMENT_TYPED_ATTR_READER(class, attr, type, data_type) \
+#define IMPLEMENT_TYPED_ATTR_READER(klass, attr, type, data_type) \
     {\
-        class *ptr;\
+        klass *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
             rm_check_destroyed(self); \
         }\
-        TypedData_Get_Struct(self, class, data_type, 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 IMPLEMENT_TYPED_ATTR_READERF(class, attr, field, type, data_type) \
+#define IMPLEMENT_TYPED_ATTR_READERF(klass, attr, field, type, data_type) \
     {\
-        class *ptr;\
+        klass *ptr;\
         rm_check_destroyed(self); \
-        TypedData_Get_Struct(self, class, data_type, ptr);\
+        TypedData_Get_Struct(self, klass, data_type, ptr);\
         return C_##type##_to_R_##type(ptr->field);\
     }
 
 //! define attribute writer
-#define IMPLEMENT_TYPED_ATTR_WRITER(class, attr, type, data_type) \
+#define IMPLEMENT_TYPED_ATTR_WRITER(klass, attr, type, data_type) \
     {\
-        class *ptr;\
+        klass *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
             rm_check_destroyed(self); \
         }\
         rb_check_frozen(self);\
-        TypedData_Get_Struct(self, class, data_type, 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(class, attr, field, type, data_type) \
+#define IMPLEMENT_TYPED_ATTR_WRITERF(klass, attr, field, type, data_type) \
     {\
-        class *ptr;\
+        klass *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
             rm_check_destroyed(self); \
         }\
         rb_check_frozen(self);\
-        TypedData_Get_Struct(self, class, data_type, ptr);\
+        TypedData_Get_Struct(self, klass, data_type, ptr);\
         ptr->field = R_##type##_to_C_##type(val);\
         return self;\
     }
@@ -504,15 +506,15 @@ extern const rb_data_type_t rm_kernel_info_data_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 ATTR_ACCESSOR(klass, attr) \
+    ATTR_READER(klass, attr)\
+    ATTR_WRITER(klass, attr)
 
 
 //!  Define a Magick module constant
@@ -544,11 +546,13 @@ extern const rb_data_type_t rm_kernel_info_data_type;
 // 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);
@@ -557,7 +561,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)
@@ -608,7 +612,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)
@@ -631,7 +635,7 @@ 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);
@@ -653,7 +657,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)
@@ -715,7 +719,7 @@ extern VALUE rm_info_new(void);
 extern DisposeType rm_dispose_to_enum(const char *);
 extern GravityType rm_gravity_to_enum(const char *);
 
-// rmkinfo.c
+// rmkinfo.cpp
 
 extern VALUE KernelInfo_alloc(VALUE);
 
@@ -728,7 +732,7 @@ extern VALUE KernelInfo_clone(VALUE);
 extern VALUE KernelInfo_builtin(VALUE, VALUE, VALUE);
 
 
-// rmimage.c
+// rmimage.cpp
 ATTR_ACCESSOR(Image, background_color)
 ATTR_READER(Image, base_columns)
 ATTR_READER(Image, base_filename)
@@ -1031,7 +1035,7 @@ extern VALUE rm_image_new(Image *);
 extern void  rm_image_destroy(void *);
 
 
-// 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);
@@ -1041,7 +1045,7 @@ extern VALUE  TextureFill_initialize(VALUE, VALUE);
 extern VALUE  TextureFill_fill(VALUE, VALUE);
 
 
-// rmpixel.c
+// rmpixel.cpp
 
 
 ATTR_ACCESSOR(Pixel, red)
@@ -1072,7 +1076,7 @@ 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);
@@ -1081,7 +1085,7 @@ 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 class, int val);
+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);
@@ -1108,7 +1112,7 @@ 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_PixelColor(PixelColor *, VALUE);
@@ -1143,7 +1147,7 @@ extern void   Export_TypeInfo(TypeInfo *, VALUE);
 extern VALUE  Import_TypeMetric(TypeMetric *);
 
 
-// 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);
@@ -1164,7 +1168,7 @@ 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 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);
@@ -1209,9 +1213,26 @@ 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

data/ext/RMagick/{rmdraw.c → rmdraw.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmdraw.c
- * @version  $Id: rmdraw.c,v 1.83 2009/12/20 02:33:33 baror Exp $
+ * @file     rmdraw.cpp
+ * @version  $Id: rmdraw.cpp,v 1.83 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -295,7 +295,7 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
         w = FIX2INT(weight);
         if (w < 100 || w > 900)
         {
-            rb_raise(rb_eArgError, "invalid font weight (%"RMIuSIZE" given)", w);
+            rb_raise(rb_eArgError, "invalid font weight (%" RMIuSIZE " given)", w);
         }
         draw->info->weight = w;
     }
@@ -480,7 +480,7 @@ Image *str_to_image(VALUE str)
 
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
-        GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(str), RSTRING_LEN(str), exception };
+        GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(str), (size_t)RSTRING_LEN(str), exception };
         image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
@@ -595,8 +595,8 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     draw->info->stroke_width = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("stroke_width")));
     draw->info->fill_pattern = str_to_image(rb_hash_aref(ddraw, CSTR2SYM("fill_pattern")));
     draw->info->stroke_pattern = str_to_image(rb_hash_aref(ddraw, CSTR2SYM("stroke_pattern")));
-    draw->info->stroke_antialias = RTEST(rb_hash_aref(ddraw, CSTR2SYM("stroke_antialias")));
-    draw->info->text_antialias = RTEST(rb_hash_aref(ddraw, CSTR2SYM("text_antialias")));
+    draw->info->stroke_antialias = (MagickBooleanType)RTEST(rb_hash_aref(ddraw, CSTR2SYM("stroke_antialias")));
+    draw->info->text_antialias = (MagickBooleanType)RTEST(rb_hash_aref(ddraw, CSTR2SYM("text_antialias")));
     draw->info->decorate = (DecorationType) FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("decorate")));
     OBJ_TO_MAGICK_STRING(draw->info->font, rb_hash_aref(ddraw, CSTR2SYM("font")));
     OBJ_TO_MAGICK_STRING(draw->info->family, rb_hash_aref(ddraw, CSTR2SYM("family")));
@@ -612,7 +612,7 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     val = rb_hash_aref(ddraw, CSTR2SYM("undercolor"));
     Color_to_PixelColor(&draw->info->undercolor, val);
 
-    draw->info->clip_units = FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("clip_units")));
+    draw->info->clip_units = (ClipPathUnits)FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("clip_units")));
 #if defined(IMAGEMAGICK_7)
     draw->info->alpha = NUM2QUANTUM(rb_hash_aref(ddraw, CSTR2SYM("alpha")));
 #else
@@ -957,7 +957,7 @@ Draw_clone(VALUE self)
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *
- * @overload composite(x, y, width, height, image, operator = Magick::OverCompositeOp)
+ * @overload composite(x, y, width, height, image, composite_op = Magick::OverCompositeOp)
  *   - The "image" argument can be either an ImageList object or an Image
  *     argument.
  *   @param x [Float] x position
@@ -966,7 +966,7 @@ Draw_clone(VALUE self)
  *   @param height [Float] the height
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
- *   @param operator [Magick::CompositeOperator] the operator
+ *   @param composite_op [Magick::CompositeOperator] the operator
  *
  * @return [Magick::Draw] self
  */
@@ -976,7 +976,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     Draw *draw;
     const char *op;
     double x, y, width, height;
-    CompositeOperator cop;
+    CompositeOperator composite_op;
     VALUE image;
     Image *comp_img;
     struct TmpFile_Name *tmpfile_name;
@@ -998,16 +998,16 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     width  = NUM2DBL(argv[2]);
     height = NUM2DBL(argv[3]);
 
-    cop = OverCompositeOp;
+    composite_op = OverCompositeOp;
     if (argc == 6)
     {
-        VALUE_TO_ENUM(argv[5], cop, CompositeOperator);
+        VALUE_TO_ENUM(argv[5], composite_op, CompositeOperator);
     }
 
-    op = CommandOptionToMnemonic(MagickComposeOptions, cop);
+    op = CommandOptionToMnemonic(MagickComposeOptions, composite_op);
     if (rm_strcasecmp("Unrecognized", op) == 0)
     {
-        rb_raise(rb_eArgError, "unknown composite operator (%d)", cop);
+        rb_raise(rb_eArgError, "unknown composite operator (%d)", composite_op);
     }
 
     TypedData_Get_Struct(self, Draw, &rm_draw_data_type, draw);
@@ -1018,7 +1018,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     // Add the temp filename to the filename array.
     // Use Magick storage since we need to keep the list around
     // until destroy_Draw is called.
-    tmpfile_name = magick_malloc(sizeof(struct TmpFile_Name) + rm_strnlen_s(name, sizeof(name)));
+    tmpfile_name = (struct TmpFile_Name *)magick_malloc(sizeof(struct TmpFile_Name) + rm_strnlen_s(name, sizeof(name)));
     strcpy(tmpfile_name->name, name);
     tmpfile_name->next = draw->tmpfile_ary;
     draw->tmpfile_ary = tmpfile_name;
@@ -1235,14 +1235,14 @@ Draw_inspect(VALUE self)
  *
  * @return [Magick::Draw] a new Draw object
  */
-VALUE Draw_alloc(VALUE class)
+VALUE Draw_alloc(VALUE klass)
 {
     Draw *draw;
     VALUE draw_obj;
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
-    draw_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw);
+    draw_obj = TypedData_Wrap_Struct(klass, &rm_draw_data_type, draw);
 
     RB_GC_GUARD(draw_obj);
 
@@ -1388,14 +1388,14 @@ new_DrawOptions(void)
  * @return [Magick::Image::DrawOptions] a new DrawOptions object
  */
 VALUE
-DrawOptions_alloc(VALUE class)
+DrawOptions_alloc(VALUE klass)
 {
     Draw *draw_options;
     VALUE draw_options_obj;
 
     draw_options = ALLOC(Draw);
     memset(draw_options, 0, sizeof(Draw));
-    draw_options_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw_options);
+    draw_options_obj = TypedData_Wrap_Struct(klass, &rm_draw_data_type, draw_options);
 
     RB_GC_GUARD(draw_options_obj);
 
@@ -1433,12 +1433,12 @@ DrawOptions_initialize(VALUE self)
  * Allocate a new Magick::Image::PolaroidOptions object.
  *
  * - Internally a PolaroidOptions object is the same as a Draw object. The
- *   methods are implemented by Draw methods in rmdraw.c.
+ *   methods are implemented by Draw methods in rmdraw.cpp.
  *
  * @return [Magick::Image::PolaroidOptions] a new PolaroidOptions object
  */
 VALUE
-PolaroidOptions_alloc(VALUE class)
+PolaroidOptions_alloc(VALUE klass)
 {
     VALUE polaroid_obj;
     ImageInfo *image_info;
@@ -1452,7 +1452,7 @@ PolaroidOptions_alloc(VALUE class)
     draw->info = CloneDrawInfo(image_info, (DrawInfo *) NULL);
     (void) DestroyImageInfo(image_info);
 
-    polaroid_obj = TypedData_Wrap_Struct(class, &rm_draw_data_type, draw);
+    polaroid_obj = TypedData_Wrap_Struct(klass, &rm_draw_data_type, draw);
 
     RB_GC_GUARD(polaroid_obj);
 
@@ -1612,7 +1612,7 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
     VALUE t;
     TypeMetric metrics;
     char *text = NULL;
-    long text_l;
+    size_t text_l;
     MagickBooleanType okay;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
@@ -1667,7 +1667,8 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
 #else
     GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics };
 #endif
-    okay = (MagickBooleanType)CALL_FUNC_WITHOUT_GVL(fp, &args);
+    void *ret = CALL_FUNC_WITHOUT_GVL(fp, &args);
+    okay = reinterpret_cast<MagickBooleanType &>(ret);
 
     magick_free(draw->info->text);
     draw->info->text = NULL;