rmagick 4.2.6 → 5.5.0

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

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmenum.c
- * @version  $Id: rmenum.c,v 1.9 2009/12/20 02:33:33 baror Exp $
+ * @file     rmenum.cpp
+ * @version  $Id: rmenum.cpp,v 1.9 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -18,9 +18,15 @@
 
 static VALUE Enum_type_values(VALUE);
 static VALUE Enum_type_inspect(VALUE);
+static void rm_enum_free(void *magick_enum);
+static size_t rm_enum_memsize(const void *magick_enum);
 
-
-
+const rb_data_type_t rm_enum_data_type = {
+    "Magick::Enum",
+    { NULL, rm_enum_free, rm_enum_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
 
 
 /**
@@ -34,14 +40,14 @@ static VALUE Enum_type_inspect(VALUE);
 VALUE
 rm_define_enum_type(const char *tag)
 {
-    VALUE class;
+    VALUE klass;
 
-    class = rb_define_class_under(Module_Magick, tag, Class_Enum);\
+    klass = rb_define_class_under(Module_Magick, tag, Class_Enum);\
 
-    rb_define_singleton_method(class, "values", Enum_type_values, 0);
-    rb_define_method(class, "initialize", Enum_type_initialize, 2);
-    rb_define_method(class, "inspect", Enum_type_inspect, 0);
-    return class;
+    rb_define_singleton_method(klass, "values", RUBY_METHOD_FUNC(Enum_type_values), 0);
+    rb_define_method(klass, "initialize", RUBY_METHOD_FUNC(Enum_type_initialize), 2);
+    rb_define_method(klass, "inspect", RUBY_METHOD_FUNC(Enum_type_inspect), 0);
+    return klass;
 }
 
 
@@ -50,19 +56,19 @@ rm_define_enum_type(const char *tag)
  *
  * No Ruby usage (internal function)
  *
- * @param class the subclass
+ * @param klass the subclass
  * @param sym the symbol
  * @param val the value for the symbol
  * @return a new instance of class
  */
 VALUE
-rm_enum_new(VALUE class, VALUE sym, VALUE val)
+rm_enum_new(VALUE klass, VALUE sym, VALUE val)
 {
     VALUE argv[2];
 
     argv[0] = sym;
     argv[1] = val;
-    return rb_obj_freeze(rb_class_new_instance(2, argv, class));
+    return rb_obj_freeze(rb_class_new_instance(2, argv, klass));
 }
 
 /**
@@ -78,7 +84,7 @@ rm_enum_to_cstr(VALUE enum_type)
 {
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(enum_type, MagickEnum, magick_enum);
+    TypedData_Get_Struct(enum_type, MagickEnum, &rm_enum_data_type, magick_enum);
     return rb_id2name(magick_enum->id);
 }
 
@@ -93,18 +99,31 @@ static void rm_enum_free(void *magick_enum)
 {
     xfree(magick_enum);
 }
+
+/**
+  * Get Enum object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param magick_enum the enum
+  */
+ static size_t rm_enum_memsize(const void *magick_enum)
+ {
+     return sizeof(MagickEnum);
+ }
+
 /**
  * Enum class alloc function.
  *
  * @return [Magick::Enum] a new enumerator
  */
 VALUE
-Enum_alloc(VALUE class)
+Enum_alloc(VALUE klass)
 {
     MagickEnum *magick_enum;
     VALUE enumr;
 
-    enumr = Data_Make_Struct(class, MagickEnum, NULL, rm_enum_free, magick_enum);
+    enumr = TypedData_Make_Struct(klass, MagickEnum, &rm_enum_data_type, magick_enum);
     rb_obj_freeze(enumr);
 
     return enumr;
@@ -122,11 +141,11 @@ Enum_case_eq(VALUE self, VALUE other)
 {
     if (CLASS_OF(self) == CLASS_OF(other))
     {
-        MagickEnum *this, *that;
+        MagickEnum *self_enum, *other_enum;
 
-        Data_Get_Struct(self, MagickEnum, this);
-        Data_Get_Struct(other, MagickEnum, that);
-        return this->val == that->val ? Qtrue : Qfalse;
+        TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, self_enum);
+        TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, other_enum);
+        return self_enum->val == other_enum->val ? Qtrue : Qfalse;
     }
 
     return Qfalse;
@@ -145,7 +164,7 @@ Enum_initialize(VALUE self, VALUE sym, VALUE val)
 {
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(self, MagickEnum, magick_enum);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, magick_enum);
     magick_enum->id = rb_to_id(sym); /* convert symbol to ID */
     magick_enum->val = NUM2INT(val);
 
@@ -163,7 +182,7 @@ Enum_to_i(VALUE self)
 {
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(self, MagickEnum, magick_enum);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, magick_enum);
     return INT2NUM(magick_enum->val);
 }
 
@@ -177,20 +196,20 @@ Enum_to_i(VALUE self)
 VALUE
 Enum_spaceship(VALUE self, VALUE other)
 {
-    MagickEnum *this, *that;
+    MagickEnum *self_enum, *other_enum;
 
     if(CLASS_OF(self) != CLASS_OF(other)) {
         return Qnil;
     }
 
-    Data_Get_Struct(self, MagickEnum, this);
-    Data_Get_Struct(other, MagickEnum, that);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, self_enum);
+    TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, other_enum);
 
-    if (this->val > that->val)
+    if (self_enum->val > other_enum->val)
     {
         return INT2FIX(1);
     }
-    else if (this->val < that->val)
+    else if (self_enum->val < other_enum->val)
     {
         return INT2FIX(-1);
     }
@@ -205,25 +224,25 @@ Enum_spaceship(VALUE self, VALUE other)
  * @return [Magick::Enum] new Enum instance
  */
 VALUE
-Enum_bitwise_or(VALUE self, VALUE another)
+Enum_bitwise_or(VALUE self, VALUE other)
 {
-    VALUE new_enum, cls;
-    MagickEnum *this, *that, *new_enum_data;
+    VALUE new_enum, klass;
+    MagickEnum *self_enum, *other_enum, *new_enum_data;
 
-    cls = CLASS_OF(self);
-    if (CLASS_OF(another) != cls)
+    klass = CLASS_OF(self);
+    if (CLASS_OF(other) != klass)
     {
-        rb_raise(rb_eArgError, "Expected class %s but got %s", rb_class2name(cls), rb_class2name(CLASS_OF(another)));
+        rb_raise(rb_eArgError, "Expected class %s but got %s", rb_class2name(klass), rb_class2name(CLASS_OF(other)));
     }
 
-    new_enum = Enum_alloc(cls);
+    new_enum = Enum_alloc(klass);
 
-    Data_Get_Struct(self, MagickEnum, this);
-    Data_Get_Struct(another, MagickEnum, that);
-    Data_Get_Struct(new_enum, MagickEnum, new_enum_data);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, self_enum);
+    TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, other_enum);
+    TypedData_Get_Struct(new_enum, MagickEnum, &rm_enum_data_type, new_enum_data);
 
-    new_enum_data->id = rb_to_id(rb_sprintf("%s|%s", rb_id2name(this->id), rb_id2name(that->id)));
-    new_enum_data->val = this->val | that->val;
+    new_enum_data->id = rb_to_id(rb_sprintf("%s|%s", rb_id2name(self_enum->id), rb_id2name(other_enum->id)));
+    new_enum_data->val = self_enum->val | other_enum->val;
 
     return new_enum;
 }
@@ -282,7 +301,7 @@ Enum_type_inspect(VALUE self)
     char str[100];
     MagickEnum *magick_enum;
 
-    Data_Get_Struct(self, MagickEnum, magick_enum);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, magick_enum);
     snprintf(str, sizeof(str), "%.48s=%d", rb_id2name(magick_enum->id), magick_enum->val);
 
     return rb_str_new2(str);
@@ -302,13 +321,13 @@ Enum_type_inspect(VALUE self)
  *   @return [Magick::Enum] self
  */
 static VALUE
-Enum_type_values(VALUE class)
+Enum_type_values(VALUE klass)
 {
     VALUE enumerators, copy;
     VALUE rv;
     int x;
 
-    enumerators = rb_cv_get(class, ENUMERATORS_CLASS_VAR);
+    enumerators = rb_cv_get(klass, ENUMERATORS_CLASS_VAR);
 
     if (rb_block_given_p())
     {
@@ -316,7 +335,7 @@ Enum_type_values(VALUE class)
         {
             rb_yield(rb_ary_entry(enumerators, x));
         }
-        rv = class;
+        rv = klass;
     }
     else
     {
@@ -341,25 +360,25 @@ Enum_type_values(VALUE class)
  *
  * No Ruby usage (internal function)
  *
- * @param class the class type
+ * @param klass the class type
  * @param value the value for enum
  * @return a enumerator
  */
 
 VALUE
-Enum_find(VALUE class, int val)
+Enum_find(VALUE klass, int val)
 {
     VALUE enumerators;
     MagickEnum *magick_enum;
     int x;
 
-    enumerators = rb_cv_get(class, ENUMERATORS_CLASS_VAR);
+    enumerators = rb_cv_get(klass, ENUMERATORS_CLASS_VAR);
     enumerators = rm_check_ary_type(enumerators);
 
     for (x = 0; x < RARRAY_LEN(enumerators); x++)
     {
         VALUE enumerator = rb_ary_entry(enumerators, x);
-        Data_Get_Struct(enumerator, MagickEnum, magick_enum);
+        TypedData_Get_Struct(enumerator, MagickEnum, &rm_enum_data_type, magick_enum);
         if (magick_enum->val == val)
         {
             return enumerator;
@@ -379,9 +398,9 @@ Enum_find(VALUE class, int val)
  * @return a new enumerator
  */
 VALUE
-ClassType_find(ClassType cls)
+ClassType_find(ClassType klass)
 {
-    return Enum_find(Class_ClassType, cls);
+    return Enum_find(Class_ClassType, klass);
 }
 
 
@@ -466,7 +485,7 @@ ComplianceType_find(ComplianceType compliance)
     if ((compliance & (SVGCompliance|X11Compliance|XPMCompliance))
         == (SVGCompliance|X11Compliance|XPMCompliance))
     {
-        c = SVGCompliance|X11Compliance|XPMCompliance;
+        c = (ComplianceType)(SVGCompliance|X11Compliance|XPMCompliance);
     }
     else if (compliance & SVGCompliance)
     {

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

@@ -5,13 +5,18 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmfill.c
- * @version  $Id: rmfill.c,v 1.33 2009/12/20 02:33:33 baror Exp $
+ * @file     rmfill.cpp
+ * @version  $Id: rmfill.cpp,v 1.33 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
 #include "rmagick.h"
 
+static void GradientFill_free(void *fill);
+static size_t GradientFill_memsize(const void *ptr);
+static void TextureFill_free(void *fill_obj);
+static size_t TextureFill_memsize(const void *ptr);
+
 /** Data associated with a GradientFill */
 typedef struct
 {
@@ -29,29 +34,63 @@ typedef struct
     Image *texture; /**< the texture */
 } rm_TextureFill;
 
+const rb_data_type_t rm_gradient_fill_data_type = {
+    "Magick::GradientFill",
+    { NULL, GradientFill_free, GradientFill_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
+
+const rb_data_type_t rm_texture_fill_data_type = {
+    "Magick::TextureFill",
+    { NULL, TextureFill_free, TextureFill_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
+
+
+DEFINE_GVL_STUB2(SyncAuthenticPixels, Image *, ExceptionInfo *);
+
+
 /**
- * Free Fill or Fill subclass object (except for TextureFill).
+ * Free GradientFill or GradientFill subclass object (except for TextureFill).
  *
  * No Ruby usage (internal function)
  *
  * @param fill the fill
  */
-static void free_Fill(void *fill)
+static void
+GradientFill_free(void *fill)
 {
     xfree(fill);
 }
 
+
+/**
+  * Get GradientFill object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param ptr pointer to the GradientFill object
+  */
+static size_t
+GradientFill_memsize(const void *ptr)
+{
+    return sizeof(rm_GradientFill);
+}
+
+
 /**
  * Create new GradientFill object.
  *
  * @return [Magick::GradientFill] a new GradientFill object
  */
 VALUE
-GradientFill_alloc(VALUE class)
+GradientFill_alloc(VALUE klass)
 {
     rm_GradientFill *fill;
 
-    return Data_Make_Struct(class, rm_GradientFill, NULL, free_Fill, fill);
+    return TypedData_Make_Struct(klass, rm_GradientFill, &rm_gradient_fill_data_type, fill);
 }
 
 
@@ -78,7 +117,7 @@ GradientFill_initialize(
 {
     rm_GradientFill *fill;
 
-    Data_Get_Struct(self, rm_GradientFill, fill);
+    TypedData_Get_Struct(self, rm_GradientFill, &rm_gradient_fill_data_type, fill);
 
     fill->x1 = NUM2DBL(x1);
     fill->y1 = NUM2DBL(y1);
@@ -153,7 +192,8 @@ point_fill(
 #endif
         }
 
-        SyncAuthenticPixels(image, exception);
+        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
         CHECK_EXCEPTION();
     }
 
@@ -222,7 +262,8 @@ vertical_fill(
             row_pixels += GetPixelChannels(image);
         }
 
-        SyncAuthenticPixels(image, exception);
+        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
         CHECK_EXCEPTION();
     }
 
@@ -255,7 +296,8 @@ vertical_fill(
 
         memcpy(row_pixels, master, image->columns * sizeof(PixelPacket));
 
-        SyncAuthenticPixels(image, exception);
+        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
         if (rm_should_raise_exception(exception, RetainExceptionRetention))
         {
             xfree((void *)master);
@@ -328,7 +370,8 @@ horizontal_fill(
             row_pixels += GetPixelChannels(image);
         }
 
-        SyncAuthenticPixels(image, exception);
+        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
         CHECK_EXCEPTION();
     }
 
@@ -360,7 +403,8 @@ horizontal_fill(
 
         memcpy(col_pixels, master, image->rows * sizeof(PixelPacket));
 
-        SyncAuthenticPixels(image, exception);
+        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
         if (rm_should_raise_exception(exception, RetainExceptionRetention))
         {
             xfree((void *)master);
@@ -471,7 +515,8 @@ v_diagonal_fill(
 #endif
         }
 
-        SyncAuthenticPixels(image, exception);
+        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
         CHECK_EXCEPTION();
     }
 
@@ -577,7 +622,8 @@ h_diagonal_fill(
 #endif
         }
 
-        SyncAuthenticPixels(image, exception);
+        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
         CHECK_EXCEPTION();
     }
 
@@ -588,7 +634,7 @@ h_diagonal_fill(
  * Call GradientFill with the start and stop colors specified when this fill
  * object was created.
  *
- * @param image_obj [Magick::Image] the image to fill
+ * @param image_obj [Magick::Image, Magick::ImageList] the image to fill
  * @return [Magick::GradientFill] self
  */
 VALUE
@@ -599,8 +645,8 @@ GradientFill_fill(VALUE self, VALUE image_obj)
     PixelColor start_color, stop_color;
     double x1, y1, x2, y2;          // points on the line
 
-    Data_Get_Struct(self, rm_GradientFill, fill);
-    image = rm_check_destroyed(image_obj);
+    TypedData_Get_Struct(self, rm_GradientFill, &rm_gradient_fill_data_type, fill);
+    image = rm_check_destroyed(rm_cur_image(image_obj));
 
     x1 = fill->x1;
     y1 = fill->y1;
@@ -662,7 +708,7 @@ GradientFill_fill(VALUE self, VALUE image_obj)
  * @param fill_obj the TextureFill
  */
 static void
-free_TextureFill(void *fill_obj)
+TextureFill_free(void *fill_obj)
 {
     rm_TextureFill *fill = (rm_TextureFill *)fill_obj;
 
@@ -674,16 +720,31 @@ free_TextureFill(void *fill_obj)
     xfree(fill);
 }
 
+
+/**
+  * Get TextureFill object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param ptr pointer to the TextureFill object
+  */
+static size_t
+TextureFill_memsize(const void *ptr)
+{
+    return sizeof(rm_TextureFill);
+}
+
+
 /**
  * Create new TextureFill object.
  *
  * @return [Magick::TextureFill] a new TextureFill object
  */
 VALUE
-TextureFill_alloc(VALUE class)
+TextureFill_alloc(VALUE klass)
 {
     rm_TextureFill *fill;
-    return Data_Make_Struct(class, rm_TextureFill, NULL, free_TextureFill, fill);
+    return TypedData_Make_Struct(klass, rm_TextureFill, &rm_texture_fill_data_type, fill);
 }
 
 /**
@@ -700,7 +761,7 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
     Image *texture;
     VALUE texture_image;
 
-    Data_Get_Struct(self, rm_TextureFill, fill);
+    TypedData_Get_Struct(self, rm_TextureFill, &rm_texture_fill_data_type, fill);
 
     texture_image = rm_cur_image(texture_arg);
 
@@ -719,7 +780,7 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
  * Call TextureFill with the texture specified when this fill object was
  * created.
  *
- * @param image_obj [Magick::Image] the image to fill
+ * @param image_obj [Magick::Image, Magick::ImageList] the image to fill
  * @return [Magick::TextureFill] self
  */
 VALUE
@@ -731,8 +792,8 @@ TextureFill_fill(VALUE self, VALUE image_obj)
     ExceptionInfo *exception;
 #endif
 
-    image = rm_check_destroyed(image_obj);
-    Data_Get_Struct(self, rm_TextureFill, fill);
+    image = rm_check_destroyed(rm_cur_image(image_obj));
+    TypedData_Get_Struct(self, rm_TextureFill, &rm_texture_fill_data_type, fill);
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();