rmagick 4.2.5 → 5.5.0

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

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmpixel.c
- * @version  $Id: rmpixel.c,v 1.7 2009/12/21 10:34:58 baror Exp $
+ * @file     rmpixel.cpp
+ * @version  $Id: rmpixel.cpp,v 1.7 2009/12/21 10:34:58 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -19,6 +19,15 @@
 
 static VALUE color_arg_rescue(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void Color_Name_to_PixelColor(PixelColor *, VALUE);
+static void Pixel_destroy(void *);
+static size_t Pixel_memsize(const void *);
+
+const rb_data_type_t rm_pixel_data_type = {
+    "Magick::Pixel",
+    { NULL, Pixel_destroy, Pixel_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
 
 
 /**
@@ -26,15 +35,30 @@ static void Color_Name_to_PixelColor(PixelColor *, VALUE);
  *
  * No Ruby usage (internal function)
  *
- * @param pixel the Pixel object to destroy
+ * @param ptr the Pixel object to destroy
  */
-void
-destroy_Pixel(Pixel *pixel)
+static void
+Pixel_destroy(void *ptr)
 {
+    Pixel *pixel = (Pixel *)ptr;
     xfree(pixel);
 }
 
 
+/**
+  * Get Pixel object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param ptr pointer to the Pixel object
+  */
+static size_t
+Pixel_memsize(const void *ptr)
+{
+    return sizeof(Pixel);
+}
+
+
 /**
  * Get Pixel red value.
  *
@@ -43,7 +67,7 @@ destroy_Pixel(Pixel *pixel)
 VALUE
 Pixel_red(VALUE self)
 {
-    IMPLEMENT_ATTR_READER(Pixel, red, int);
+    IMPLEMENT_TYPED_ATTR_READER(Pixel, red, int, &rm_pixel_data_type);
 }
 
 /**
@@ -54,7 +78,7 @@ Pixel_red(VALUE self)
 VALUE
 Pixel_green(VALUE self)
 {
-    IMPLEMENT_ATTR_READER(Pixel, green, int);
+    IMPLEMENT_TYPED_ATTR_READER(Pixel, green, int, &rm_pixel_data_type);
 }
 
 /**
@@ -65,7 +89,7 @@ Pixel_green(VALUE self)
 VALUE
 Pixel_blue(VALUE self)
 {
-    IMPLEMENT_ATTR_READER(Pixel, blue, int);
+    IMPLEMENT_TYPED_ATTR_READER(Pixel, blue, int, &rm_pixel_data_type);
 }
 
 /**
@@ -77,7 +101,7 @@ VALUE
 Pixel_alpha(VALUE self)
 {
     Pixel *pixel;
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 #if defined(IMAGEMAGICK_7)
     return C_int_to_R_int(pixel->alpha);
 #else
@@ -102,7 +126,7 @@ Pixel_red_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->red = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -126,7 +150,7 @@ Pixel_green_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->green = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -150,7 +174,7 @@ Pixel_blue_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->blue = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -174,7 +198,7 @@ Pixel_alpha_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 #if defined(IMAGEMAGICK_7)
     pixel->alpha = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
@@ -198,7 +222,7 @@ Pixel_cyan(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->red);
 }
 
@@ -219,7 +243,7 @@ Pixel_cyan_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->red = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -236,7 +260,7 @@ Pixel_magenta(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->green);
 }
 
@@ -257,7 +281,7 @@ Pixel_magenta_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->green = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -274,7 +298,7 @@ Pixel_yellow(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->blue);
 }
 
@@ -295,7 +319,7 @@ Pixel_yellow_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->blue = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -312,7 +336,7 @@ Pixel_black(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->black);
 }
 
@@ -333,7 +357,7 @@ Pixel_black_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->black = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -376,7 +400,7 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
     if (CLASS_OF(color) == Class_Pixel)
     {
         memset(pp, 0, sizeof(*pp));
-        Data_Get_Struct(color, Pixel, pixel);
+        TypedData_Get_Struct(color, Pixel, &rm_pixel_data_type, pixel);
         pp->red     = pixel->red;
         pp->green   = pixel->green;
         pp->blue    = pixel->blue;
@@ -390,7 +414,7 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
     else
     {
         // require 'to_str' here instead of just 'to_s'.
-        color = rb_rescue(rb_str_to_str, color, color_arg_rescue, color);
+        color = rb_rescue(RESCUE_FUNC(rb_str_to_str), color, RESCUE_EXCEPTION_HANDLER_FUNC(color_arg_rescue), color);
         Color_Name_to_PixelColor(pp, color);
     }
 }
@@ -415,7 +439,7 @@ Color_to_Pixel(Pixel *pp, VALUE color)
     {
         Pixel *pixel;
 
-        Data_Get_Struct(color, Pixel, pixel);
+        TypedData_Get_Struct(color, Pixel, &rm_pixel_data_type, pixel);
         memcpy(pp, pixel, sizeof(Pixel));
     }
     else
@@ -468,13 +492,13 @@ Color_Name_to_PixelColor(PixelColor *color, VALUE name_arg)
  * @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
-Pixel_alloc(VALUE class)
+Pixel_alloc(VALUE klass)
 {
     Pixel *pixel;
 
     pixel = ALLOC(Pixel);
     memset(pixel, '\0', sizeof(Pixel));
-    return Data_Wrap_Struct(class, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(klass, &rm_pixel_data_type, pixel);
 }
 
 
@@ -490,17 +514,17 @@ Pixel_case_eq(VALUE self, VALUE other)
 {
     if (CLASS_OF(self) == CLASS_OF(other))
     {
-        Pixel *this, *that;
+        Pixel *self_pixel, *other_pixel;
 
-        Data_Get_Struct(self, Pixel, this);
-        Data_Get_Struct(other, Pixel, that);
-        return (this->red == that->red
-            && this->blue == that->blue
-            && this->green == that->green
+        TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, self_pixel);
+        TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, other_pixel);
+        return (self_pixel->red == other_pixel->red
+            && self_pixel->blue == other_pixel->blue
+            && self_pixel->green == other_pixel->green
 #if defined(IMAGEMAGICK_7)
-            && this->alpha == that->alpha) ? Qtrue : Qfalse;
+            && self_pixel->alpha == other_pixel->alpha) ? Qtrue : Qfalse;
 #else
-            && this->opacity == that->opacity) ? Qtrue : Qfalse;
+            && self_pixel->opacity == other_pixel->opacity) ? Qtrue : Qfalse;
 #endif
     }
 
@@ -547,7 +571,7 @@ Pixel_dup(VALUE self)
 
     pixel = ALLOC(Pixel);
     memset(pixel, '\0', sizeof(Pixel));
-    dup = Data_Wrap_Struct(CLASS_OF(self), NULL, destroy_Pixel, pixel);
+    dup = TypedData_Wrap_Struct(CLASS_OF(self), &rm_pixel_data_type, pixel);
     RB_GC_GUARD(dup);
 
     return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
@@ -571,8 +595,8 @@ Pixel_eql_q(VALUE self, VALUE other)
  * Compare pixel values for equality.
  *
  * @overload fcmp(other, fuzz = 0.0, colorspace = Magick::RGBColorspace)
- *   @param other [Magick::Pixel] The pixel to which the receiver is compared
- *   @param fuzz [Float] The amount of fuzz to allow before the colors are considered to be different
+ *   @param other [Magick::Pixel, String] The pixel to which the receiver is compared
+ *   @param fuzz [Numeric] The amount of fuzz to allow before the colors are considered to be different
  *   @param colorspace [Magick::ColorspaceType] The colorspace
  *   @return [Boolean] true if equal, otherwise false
  */
@@ -582,7 +606,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     double fuzz = 0.0;
     unsigned int equal;
     ColorspaceType colorspace = RGBColorspace;
-    PixelColor this, that;
+    PixelColor self_pixel_color, other_pixel_color;
 #if defined(IMAGEMAGICK_6)
     Image *image;
     Info *info;
@@ -602,15 +626,15 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
             break;
     }
 
-    Color_to_PixelColor(&this, self);
-    Color_to_PixelColor(&that, argv[0]);
+    Color_to_PixelColor(&self_pixel_color, self);
+    Color_to_PixelColor(&other_pixel_color, argv[0]);
 
 #if defined(IMAGEMAGICK_7)
-    this.fuzz = fuzz;
-    this.colorspace = colorspace;
-    that.fuzz = fuzz;
-    that.colorspace = colorspace;
-    equal = IsFuzzyEquivalencePixelInfo(&this, &that);
+    self_pixel_color.fuzz = fuzz;
+    self_pixel_color.colorspace = colorspace;
+    other_pixel_color.fuzz = fuzz;
+    other_pixel_color.colorspace = colorspace;
+    equal = IsFuzzyEquivalencePixelInfo(&self_pixel_color, &other_pixel_color);
 #else
     // The IsColorSimilar function expects to get the
     // colorspace and fuzz parameters from an Image structure.
@@ -634,7 +658,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     image->colorspace = colorspace;
     image->fuzz = fuzz;
 
-    equal = IsColorSimilar(image, &this, &that);
+    equal = IsColorSimilar(image, &self_pixel_color, &other_pixel_color);
     DestroyImage(image);
 #endif
 
@@ -655,7 +679,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
  * @see Magick::Pixel#to_color
  */
 VALUE
-Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
+Pixel_from_color(VALUE klass ATTRIBUTE_UNUSED, VALUE name)
 {
     PixelColor pp;
     ExceptionInfo *exception;
@@ -687,11 +711,11 @@ Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
  *   @param hue [Numeric, String] A value in the range.
  *   @param saturation [Numeric, String] A value in the range.
  *   @param lightness [Numeric, String] A value in the range.
- *   @param alpha [Numeric] The alpha value.
+ *   @param alpha [Numeric, String] The alpha value.
  *   @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
-Pixel_from_hsla(int argc, VALUE *argv, VALUE class ATTRIBUTE_UNUSED)
+Pixel_from_hsla(int argc, VALUE *argv, VALUE klass ATTRIBUTE_UNUSED)
 {
     double h, s, l, a = 1.0;
     MagickPixel pp;
@@ -785,7 +809,7 @@ Pixel_from_MagickPixel(const MagickPixel *pp)
 #endif
     pixel->black   = pp->index;
 
-    return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(Class_Pixel, &rm_pixel_data_type, pixel);
 }
 
 
@@ -817,7 +841,7 @@ Pixel_from_PixelPacket(const PixelPacket *pp)
     pixel->black   = 0;
 #endif
 
-    return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(Class_Pixel, &rm_pixel_data_type, pixel);
 }
 
 
@@ -849,7 +873,7 @@ Pixel_from_PixelColor(const PixelColor *pp)
     pixel->black   = 0;
 #endif
 
-    return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(Class_Pixel, &rm_pixel_data_type, pixel);
 }
 
 
@@ -864,7 +888,7 @@ Pixel_hash(VALUE self)
     Pixel *pixel;
     unsigned int hash;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     hash  = ScaleQuantumToChar(pixel->red)   << 24;
     hash += ScaleQuantumToChar(pixel->green) << 16;
@@ -892,8 +916,8 @@ Pixel_init_copy(VALUE self, VALUE orig)
 {
     Pixel *copy, *original;
 
-    Data_Get_Struct(orig, Pixel, original);
-    Data_Get_Struct(self, Pixel, copy);
+    TypedData_Get_Struct(orig, Pixel, &rm_pixel_data_type, original);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, copy);
 
     *copy = *original;
 
@@ -916,7 +940,7 @@ Pixel_initialize(int argc, VALUE *argv, VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
 #if defined(IMAGEMAGICK_7)
     pixel->alpha = OpaqueAlpha;
@@ -972,7 +996,7 @@ Pixel_intensity(VALUE self)
     Pixel *pixel;
     Quantum intensity;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     intensity = ROUND_TO_QUANTUM((0.299*pixel->red)
                                 + (0.587*pixel->green)
@@ -993,7 +1017,7 @@ Pixel_marshal_dump(VALUE self)
     Pixel *pixel;
     VALUE dpixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     dpixel = rb_hash_new();
     rb_hash_aset(dpixel, CSTR2SYM("red"), QUANTUM2NUM(pixel->red));
     rb_hash_aset(dpixel, CSTR2SYM("green"), QUANTUM2NUM(pixel->green));
@@ -1021,7 +1045,7 @@ Pixel_marshal_load(VALUE self, VALUE dpixel)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->red = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("red")));
     pixel->green = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("green")));
     pixel->blue = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("blue")));
@@ -1043,39 +1067,41 @@ Pixel_marshal_load(VALUE self, VALUE dpixel)
 VALUE
 Pixel_spaceship(VALUE self, VALUE other)
 {
-    Pixel *this, *that;
+    Pixel *self_pixel, *other_pixel;
+
+    if (CLASS_OF(self) != CLASS_OF(other)) {
+        return Qnil;
+    }
 
-    Data_Get_Struct(self, Pixel, this);
-    Data_Get_Struct(other, Pixel, that);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, self_pixel);
+    TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, other_pixel);
 
-    if (this->red != that->red)
+    if (self_pixel->red != other_pixel->red)
     {
-        return INT2NUM((this->red - that->red)/abs((int)(this->red - that->red)));
+        return INT2NUM((self_pixel->red - other_pixel->red)/abs((int)(self_pixel->red - other_pixel->red)));
     }
-    else if(this->green != that->green)
+    else if(self_pixel->green != other_pixel->green)
     {
-        return INT2NUM((this->green - that->green)/abs((int)(this->green - that->green)));
+        return INT2NUM((self_pixel->green - other_pixel->green)/abs((int)(self_pixel->green - other_pixel->green)));
     }
-    else if(this->blue != that->blue)
+    else if(self_pixel->blue != other_pixel->blue)
     {
-        return INT2NUM((this->blue - that->blue)/abs((int)(this->blue - that->blue)));
+        return INT2NUM((self_pixel->blue - other_pixel->blue)/abs((int)(self_pixel->blue - other_pixel->blue)));
     }
 #if defined(IMAGEMAGICK_7)
-    else if(this->alpha != that->alpha)
+    else if(self_pixel->alpha != other_pixel->alpha)
     {
-        return INT2NUM((this->alpha - that->alpha)/abs((int)(this->alpha - that->alpha)));
+        return INT2NUM((self_pixel->alpha - other_pixel->alpha)/abs((int)(self_pixel->alpha - other_pixel->alpha)));
     }
 #else
-    else if(this->opacity != that->opacity)
+    else if(self_pixel->opacity != other_pixel->opacity)
     {
-        return INT2NUM(((QuantumRange - this->opacity) - (QuantumRange - that->opacity))/abs((int)((QuantumRange - this->opacity) - (QuantumRange - that->opacity))));
+        return INT2NUM(((QuantumRange - self_pixel->opacity) - (QuantumRange - other_pixel->opacity))/abs((int)((QuantumRange - self_pixel->opacity) - (QuantumRange - other_pixel->opacity))));
     }
 #endif
 
-    // Values are equal, check class.
-
-    return rb_funcall(CLASS_OF(self), rb_intern("<=>"), 1, CLASS_OF(other));
-
+    // Values are equal.
+    return INT2NUM(0);
 }
 
 
@@ -1093,7 +1119,7 @@ Pixel_to_hsla(VALUE self)
     Pixel *pixel;
     VALUE hsla;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &sat, &lum);
     hue *= 360.0;
@@ -1183,13 +1209,13 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     char name[MaxTextExtent];
     ExceptionInfo *exception;
     ComplianceType compliance = AllCompliance;
-    unsigned int alpha = MagickFalse;
+    MagickBooleanType alpha = MagickFalse;
     unsigned int depth = MAGICKCORE_QUANTUM_DEPTH;
 
     switch (argc)
     {
         case 4:
-            hex = RTEST(argv[3]);
+            hex = (MagickBooleanType)RTEST(argv[3]);
         case 3:
             depth = NUM2UINT(argv[2]);
 
@@ -1209,7 +1235,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
                     break;
             }
        case 2:
-            alpha = RTEST(argv[1]);
+            alpha = (MagickBooleanType)RTEST(argv[1]);
         case 1:
             VALUE_TO_ENUM(argv[0], compliance, ComplianceType);
         case 0:
@@ -1218,7 +1244,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 to 2)", argc);
     }
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     info = CloneImageInfo(NULL);
     image = rm_acquire_image(info);
@@ -1284,7 +1310,7 @@ Pixel_to_s(VALUE self)
     Pixel *pixel;
     char buff[100];
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     snprintf(buff, sizeof(buff), "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", alpha=" QuantumFormat,
             pixel->red, pixel->green, pixel->blue,
 #if defined(IMAGEMAGICK_7)
@@ -1294,4 +1320,3 @@ Pixel_to_s(VALUE self)
 #endif
     return rb_str_new2(buff);
 }
-

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

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmstruct.c
- * @version  $Id: rmstruct.c,v 1.5 2009/12/20 02:33:34 baror Exp $
+ * @file     rmstruct.cpp
+ * @version  $Id: rmstruct.cpp,v 1.5 2009/12/20 02:33:34 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -456,8 +456,8 @@ Export_TypeInfo(TypeInfo *ti, VALUE st)
     {
         CloneString((char **)&(ti->family), StringValueCStr(m));
     }
-    m = rb_ary_entry(members, 3); ti->style   = m == Qnil ? 0 : FIX2INT(Enum_to_i(m));
-    m = rb_ary_entry(members, 4); ti->stretch = m == Qnil ? 0 : FIX2INT(Enum_to_i(m));
+    m = rb_ary_entry(members, 3); ti->style   = m == Qnil ? UndefinedStyle : (StyleType)FIX2INT(Enum_to_i(m));
+    m = rb_ary_entry(members, 4); ti->stretch = m == Qnil ? UndefinedStretch : (StretchType)FIX2INT(Enum_to_i(m));
     m = rb_ary_entry(members, 5); ti->weight  = m == Qnil ? 0 : FIX2INT(m);
 
     m = rb_ary_entry(members, 6);
@@ -524,7 +524,7 @@ Font_to_s(VALUE self)
             strcpy(weight, "BoldWeight");
             break;
         default:
-            snprintf(weight, sizeof(weight), "%"RMIuSIZE"", ti.weight);
+            snprintf(weight, sizeof(weight), "%" RMIuSIZE "", ti.weight);
             break;
     }
 
@@ -732,7 +732,7 @@ RectangleInfo_to_s(VALUE self)
     char buff[100];
 
     Export_RectangleInfo(&rect, self);
-    snprintf(buff, sizeof(buff), "width=%"RMIuSIZE", height=%"RMIuSIZE", x=%"RMIdSIZE", y=%"RMIdSIZE"",
+    snprintf(buff, sizeof(buff), "width=%" RMIuSIZE ", height=%" RMIuSIZE ", x=%" RMIdSIZE ", y=%" RMIdSIZE "",
              rect.width, rect.height, rect.x, rect.y);
     return rb_str_new2(buff);
 }