rmagick 2.13.2 → 4.2.2

data/ext/RMagick/rmstruct.c

@@ -15,16 +15,6 @@
 
 
 
-static const char *ComplianceType_name(ComplianceType *);
-static VALUE ComplianceType_new(ComplianceType);
-static const char *StretchType_name(StretchType);
-static VALUE StretchType_new(StretchType);
-static const char *StyleType_name(StyleType);
-static VALUE StyleType_new(StyleType);
-
-
-
-
 /**
  * Given a C AffineMatrix, create the equivalent AffineMatrix object.
  *
@@ -65,7 +55,7 @@ Import_AffineMatrix(AffineMatrix *affine)
 void
 Export_AffineMatrix(AffineMatrix *am, VALUE st)
 {
-    volatile VALUE values, v;
+    VALUE values, v;
 
     if (CLASS_OF(st) != Class_AffineMatrix)
     {
@@ -85,11 +75,14 @@ Export_AffineMatrix(AffineMatrix *am, VALUE st)
     am->tx = v == Qnil ? 0.0 : NUM2DBL(v);
     v = rb_ary_entry(values, 5);
     am->ty = v == Qnil ? 0.0 : NUM2DBL(v);
+
+    RB_GC_GUARD(values);
+    RB_GC_GUARD(v);
 }
 
 
 /**
- * Create a Magick::ChromaticityInfo object from a ChromaticityInfo structure.
+ * Create a {Magick::ChromaticityInfo} object from a ChromaticityInfo structure.
  *
  * No Ruby usage (internal function)
  *
@@ -99,18 +92,23 @@ Export_AffineMatrix(AffineMatrix *am, VALUE st)
 VALUE
 ChromaticityInfo_new(ChromaticityInfo *ci)
 {
-    volatile VALUE red_primary;
-    volatile VALUE green_primary;
-    volatile VALUE blue_primary;
-    volatile VALUE white_point;
+    VALUE red_primary;
+    VALUE green_primary;
+    VALUE blue_primary;
+    VALUE white_point;
 
     red_primary   = Import_PrimaryInfo(&ci->red_primary);
     green_primary = Import_PrimaryInfo(&ci->green_primary);
     blue_primary  = Import_PrimaryInfo(&ci->blue_primary);
     white_point   = Import_PrimaryInfo(&ci->white_point);
 
-    return rb_funcall(Class_Chromaticity, rm_ID_new, 4
-                    , red_primary, green_primary, blue_primary, white_point);
+    RB_GC_GUARD(red_primary);
+    RB_GC_GUARD(green_primary);
+    RB_GC_GUARD(blue_primary);
+    RB_GC_GUARD(white_point);
+
+    return rb_funcall(Class_Chromaticity, rm_ID_new, 4,
+                      red_primary, green_primary, blue_primary, white_point);
 }
 
 
@@ -126,27 +124,25 @@ ChromaticityInfo_new(ChromaticityInfo *ci)
 void
 Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
 {
-    volatile VALUE chrom_members;
-    volatile VALUE red_primary, green_primary, blue_primary, white_point;
-    volatile VALUE entry_members, x, y;
-    ID values_id;
+    VALUE chrom_members;
+    VALUE red_primary, green_primary, blue_primary, white_point;
+    VALUE entry_members, x, y;
 
     if (CLASS_OF(chrom) != Class_Chromaticity)
     {
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(chrom)));
     }
-    values_id = rm_ID_values;
 
     // Get the struct members in an array
-    chrom_members = rb_funcall(chrom, values_id, 0);
+    chrom_members = rb_funcall(chrom, rm_ID_values, 0);
     red_primary   = rb_ary_entry(chrom_members, 0);
     green_primary = rb_ary_entry(chrom_members, 1);
     blue_primary  = rb_ary_entry(chrom_members, 2);
     white_point = rb_ary_entry(chrom_members, 3);
 
     // Get the red_primary PrimaryInfo members in an array
-    entry_members = rb_funcall(red_primary, values_id, 0);
+    entry_members = rb_funcall(red_primary, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // red_primary.x
     ci->red_primary.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // red_primary.y
@@ -154,7 +150,7 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     ci->red_primary.z = 0.0;
 
     // Get the green_primary PrimaryInfo members in an array
-    entry_members = rb_funcall(green_primary, values_id, 0);
+    entry_members = rb_funcall(green_primary, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // green_primary.x
     ci->green_primary.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // green_primary.y
@@ -162,7 +158,7 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     ci->green_primary.z = 0.0;
 
     // Get the blue_primary PrimaryInfo members in an array
-    entry_members = rb_funcall(blue_primary, values_id, 0);
+    entry_members = rb_funcall(blue_primary, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // blue_primary.x
     ci->blue_primary.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // blue_primary.y
@@ -170,23 +166,28 @@ Export_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
     ci->blue_primary.z = 0.0;
 
     // Get the white_point PrimaryInfo members in an array
-    entry_members = rb_funcall(white_point, values_id, 0);
+    entry_members = rb_funcall(white_point, rm_ID_values, 0);
     x = rb_ary_entry(entry_members, 0);         // white_point.x
     ci->white_point.x = x == Qnil ? 0.0 : NUM2DBL(x);
     y = rb_ary_entry(entry_members, 1);         // white_point.y
     ci->white_point.y = y == Qnil ? 0.0 : NUM2DBL(y);
     ci->white_point.z = 0.0;
+
+    RB_GC_GUARD(chrom_members);
+    RB_GC_GUARD(red_primary);
+    RB_GC_GUARD(green_primary);
+    RB_GC_GUARD(blue_primary);
+    RB_GC_GUARD(white_point);
+    RB_GC_GUARD(entry_members);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
 }
 
 
 /**
- * Create a string representation of a Magick::Chromaticity.
+ * Return a string representation of a {Magick::Chromaticity} object.
  *
- * Ruby usage:
- *   - @verbatim Magick::Chromaticity#to_s @endverbatim
- *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 ChromaticityInfo_to_s(VALUE self)
@@ -195,7 +196,8 @@ ChromaticityInfo_to_s(VALUE self)
     char buff[200];
 
     Export_ChromaticityInfo(&ci, self);
-    sprintf(buff, "red_primary=(x=%g,y=%g) "
+    snprintf(buff, sizeof(buff),
+                  "red_primary=(x=%g,y=%g) "
                   "green_primary=(x=%g,y=%g) "
                   "blue_primary=(x=%g,y=%g) "
                   "white_point=(x=%g,y=%g) ",
@@ -219,18 +221,22 @@ VALUE
 Import_ColorInfo(const ColorInfo *ci)
 {
     ComplianceType compliance_type;
-    volatile VALUE name;
-    volatile VALUE compliance;
-    volatile VALUE color;
+    VALUE name;
+    VALUE compliance;
+    VALUE color;
 
     name       = rb_str_new2(ci->name);
 
     compliance_type = ci->compliance;
-    compliance = ComplianceType_new(compliance_type);
-    color      = Pixel_from_MagickPixelPacket(&(ci->color));
+    compliance = ComplianceType_find(compliance_type);
+    color      = Pixel_from_MagickPixel(&(ci->color));
+
+    RB_GC_GUARD(name);
+    RB_GC_GUARD(compliance);
+    RB_GC_GUARD(color);
 
-    return rb_funcall(Class_Color, rm_ID_new, 3
-                    , name, compliance, color);
+    return rb_funcall(Class_Color, rm_ID_new, 3,
+                      name, compliance, color);
 }
 
 
@@ -245,8 +251,8 @@ Import_ColorInfo(const ColorInfo *ci)
 void
 Export_ColorInfo(ColorInfo *ci, VALUE st)
 {
-    Pixel *pixel;
-    volatile VALUE members, m;
+    PixelColor pixel;
+    VALUE members, m;
 
     if (CLASS_OF(st) != Class_Color)
     {
@@ -261,7 +267,7 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ci->name), StringValuePtr(m));
+        CloneString((char **)&(ci->name), StringValueCStr(m));
     }
     m = rb_ary_entry(members, 1);
     if (m != Qnil)
@@ -271,45 +277,55 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
     m = rb_ary_entry(members, 2);
     if (m != Qnil)
     {
-        Data_Get_Struct(m, Pixel, pixel);
+        Color_to_PixelColor(&pixel, m);
         // For >= 6.3.0, ColorInfo.color is a MagickPixelPacket so we have to
         // convert the PixelPacket.
-        GetMagickPixelPacket(NULL, &ci->color);
-        ci->color.red = (MagickRealType) pixel->red;
-        ci->color.green = (MagickRealType) pixel->green;
-        ci->color.blue = (MagickRealType) pixel->blue;
+        rm_init_magickpixel(NULL, &ci->color);
+        ci->color.red = (MagickRealType) pixel.red;
+        ci->color.green = (MagickRealType) pixel.green;
+        ci->color.blue = (MagickRealType) pixel.blue;
+#if defined(IMAGEMAGICK_7)
+        ci->color.alpha = (MagickRealType) OpaqueAlpha;
+#else
         ci->color.opacity = (MagickRealType) OpaqueOpacity;
+#endif
         ci->color.index = (MagickRealType) 0;
     }
+
+    RB_GC_GUARD(members);
+    RB_GC_GUARD(m);
 }
 
 
 /**
- * Convert either a String color name or a Magick::Pixel to a MagickPixelPacket.
+ * Convert either a String color name or a Magick::Pixel to a MagickPixel.
  *
  * No Ruby usage (internal function)
  *
  * Notes:
- *   - The channel values in a MagickPixelPacket are doubles.
+ *   - The channel values in a MagickPixel are doubles.
  *
  * @param image the Image
- * @param mpp The MagickPixelPacket to modify
+ * @param mpp The MagickPixel to modify
  * @param color the name of the color
  */
 void
-Color_to_MagickPixelPacket(Image *image, MagickPixelPacket *mpp, VALUE color)
+Color_to_MagickPixel(Image *image, MagickPixel *mpp, VALUE color)
 {
-    PixelPacket pp;
+    PixelColor pp;
 
     // image can be NULL
-    GetMagickPixelPacket(image, mpp);
+    rm_init_magickpixel(image, mpp);
 
-    memset(&pp, '\0', sizeof(pp));
-    Color_to_PixelPacket(&pp, color);
+    Color_to_PixelColor(&pp, color);
     mpp->red = (MagickRealType) pp.red;
     mpp->green = (MagickRealType) pp.green;
     mpp->blue = (MagickRealType) pp.blue;
+#if defined(IMAGEMAGICK_7)
+    mpp->alpha = (MagickRealType) pp.alpha;
+#else
     mpp->opacity = (MagickRealType) pp.opacity;
+#endif
 }
 
 
@@ -330,13 +346,9 @@ destroy_ColorInfo(ColorInfo *ci)
 
 
 /**
- * Return a string representation of a Magick::Color object.
+ * Return a string representation of a {Magick::Color} object.
  *
- * Ruby usage:
- *   - @verbatim Color#to_s @endverbatim
- *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 Color_to_s(VALUE self)
@@ -346,90 +358,26 @@ Color_to_s(VALUE self)
 
     Export_ColorInfo(&ci, self);
 
-    sprintf(buff, "name=%s, compliance=%s, "
-#if (QuantumDepth == 32 || QuantumDepth == 64) && defined(HAVE_TYPE_LONG_DOUBLE)
-                  "color.red=%Lg, color.green=%Lg, color.blue=%Lg, color.opacity=%Lg ",
+    snprintf(buff, sizeof(buff),
+                  "name=%s, compliance=%s, "
+#if (MAGICKCORE_QUANTUM_DEPTH  == 32 || MAGICKCORE_QUANTUM_DEPTH  == 64) && defined(HAVE_TYPE_LONG_DOUBLE)
+                  "color.red=%Lg, color.green=%Lg, color.blue=%Lg, color.alpha=%Lg ",
 #else
-                  "color.red=%g, color.green=%g, color.blue=%g, color.opacity=%g ",
+                  "color.red=%g, color.green=%g, color.blue=%g, color.alpha=%g ",
 #endif
                   ci.name,
                   ComplianceType_name(&ci.compliance),
-                  ci.color.red, ci.color.green, ci.color.blue, ci.color.opacity);
+                  ci.color.red, ci.color.green, ci.color.blue,
+#if defined(IMAGEMAGICK_7)
+                  ci.color.alpha);
+#else
+                  QuantumRange - ci.color.opacity);
+#endif
 
     destroy_ColorInfo(&ci);
     return rb_str_new2(buff);
 }
 
-
-/**
- * Return the string representation of a ComplianceType value.
- *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - xMagick will OR multiple compliance types so we have to arbitrarily pick
- *     one name.
- *   - Set the compliance argument to the selected value.
- *
- * @param c the ComplianceType value
- * @return the string
- */
-static const char *
-ComplianceType_name(ComplianceType *c)
-{
-    if ((*c & (SVGCompliance|X11Compliance|XPMCompliance))
-        == (SVGCompliance|X11Compliance|XPMCompliance))
-    {
-        return "AllCompliance";
-    }
-    else if (*c & SVGCompliance)
-    {
-        *c = SVGCompliance;
-        return "SVGCompliance";
-    }
-    else if (*c & X11Compliance)
-    {
-        *c = X11Compliance;
-        return "X11Compliance";
-    }
-    else if (*c & XPMCompliance)
-    {
-        *c = XPMCompliance;
-        return "XPMCompliance";
-    }
-    else if (*c == NoCompliance)
-    {
-        *c = NoCompliance;
-        return "NoCompliance";
-    }
-    else
-    {
-        *c = UndefinedCompliance;
-        return "UndefinedCompliance";
-    }
-}
-
-
-/**
- * Construct a ComplianceType enum object for the specified value.
- *
- * No Ruby usage (internal function)
- *
- * @param compliance the C ComplianceType value
- * @return the Ruby ComplianceType enum object
- */
-static VALUE
-ComplianceType_new(ComplianceType compliance)
-{
-    const char *name;
-
-    // Turn off undefined bits
-    compliance &= (SVGCompliance|X11Compliance|XPMCompliance);
-    name = ComplianceType_name(&compliance);
-    return rm_enum_new(Class_ComplianceType, ID2SYM(rb_intern(name)), INT2FIX(compliance));
-}
-
-
 /**
  * Convert a TypeInfo structure to a Magick::Font.
  *
@@ -441,23 +389,33 @@ ComplianceType_new(ComplianceType compliance)
 VALUE
 Import_TypeInfo(const TypeInfo *ti)
 {
-    volatile VALUE name, description, family;
-    volatile VALUE style, stretch, weight;
-    volatile VALUE encoding, foundry, format;
+    VALUE name, description, family;
+    VALUE style, stretch, weight;
+    VALUE encoding, foundry, format;
 
     name        = rb_str_new2(ti->name);
     family      = rb_str_new2(ti->family);
-    style       = StyleType_new(ti->style);
-    stretch     = StretchType_new(ti->stretch);
+    style       = StyleType_find(ti->style);
+    stretch     = StretchType_find(ti->stretch);
     weight      = ULONG2NUM(ti->weight);
     description = ti->description ? rb_str_new2(ti->description) : Qnil;
     encoding    = ti->encoding    ? rb_str_new2(ti->encoding) : Qnil;
     foundry     = ti->foundry     ? rb_str_new2(ti->foundry)  : Qnil;
     format      = ti->format      ? rb_str_new2(ti->format)   : Qnil;
 
-    return rb_funcall(Class_Font, rm_ID_new, 9
-                    , name, description, family, style
-                    , stretch, weight, encoding, foundry, format);
+    RB_GC_GUARD(name);
+    RB_GC_GUARD(description);
+    RB_GC_GUARD(family);
+    RB_GC_GUARD(style);
+    RB_GC_GUARD(stretch);
+    RB_GC_GUARD(weight);
+    RB_GC_GUARD(encoding);
+    RB_GC_GUARD(foundry);
+    RB_GC_GUARD(format);
+
+    return rb_funcall(Class_Font, rm_ID_new, 9,
+                      name, description, family, style,
+                      stretch, weight, encoding, foundry, format);
 }
 
 
@@ -472,7 +430,7 @@ Import_TypeInfo(const TypeInfo *ti)
 void
 Export_TypeInfo(TypeInfo *ti, VALUE st)
 {
-    volatile VALUE members, m;
+    VALUE members, m;
 
     if (CLASS_OF(st) != Class_Font)
     {
@@ -486,31 +444,34 @@ Export_TypeInfo(TypeInfo *ti, VALUE st)
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->name), StringValuePtr(m));
+        CloneString((char **)&(ti->name), StringValueCStr(m));
     }
     m = rb_ary_entry(members, 1);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->description), StringValuePtr(m));
+        CloneString((char **)&(ti->description), StringValueCStr(m));
     }
     m = rb_ary_entry(members, 2);
     if (m != Qnil)
     {
-        (void) CloneString((char **)&(ti->family), StringValuePtr(m));
+        CloneString((char **)&(ti->family), StringValueCStr(m));
     }
-    m = rb_ary_entry(members, 3); ti->style   = m == Qnil ? 0 : FIX2INT(m);
-    m = rb_ary_entry(members, 4); ti->stretch = m == Qnil ? 0 : FIX2INT(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, 5); ti->weight  = m == Qnil ? 0 : FIX2INT(m);
 
     m = rb_ary_entry(members, 6);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->encoding), StringValuePtr(m));
+        CloneString((char **)&(ti->encoding), StringValueCStr(m));
     m = rb_ary_entry(members, 7);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->foundry), StringValuePtr(m));
+        CloneString((char **)&(ti->foundry), StringValueCStr(m));
     m = rb_ary_entry(members, 8);
     if (m != Qnil)
-        (void) CloneString((char **)&(ti->format), StringValuePtr(m));
+        CloneString((char **)&(ti->format), StringValueCStr(m));
+
+    RB_GC_GUARD(members);
+    RB_GC_GUARD(m);
 }
 
 
@@ -541,12 +502,9 @@ destroy_TypeInfo(TypeInfo *ti)
 
 
 /**
- * Implement the Font#to_s method.
+ * Return a string representation of a {Magick::Font} object.
  *
- * No Ruby usage (internal function)
- *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 Font_to_s(VALUE self)
@@ -566,11 +524,12 @@ Font_to_s(VALUE self)
             strcpy(weight, "BoldWeight");
             break;
         default:
-            sprintf(weight, "%lu", ti.weight);
+            snprintf(weight, sizeof(weight), "%"RMIuSIZE"", ti.weight);
             break;
     }
 
-    sprintf(buff, "name=%s, description=%s, "
+    snprintf(buff, sizeof(buff),
+                  "name=%s, description=%s, "
                   "family=%s, style=%s, stretch=%s, weight=%s, "
                   "encoding=%s, foundry=%s, format=%s",
                   ti.name,
@@ -600,8 +559,8 @@ Font_to_s(VALUE self)
 VALUE
 Import_PointInfo(PointInfo *p)
 {
-    return rb_funcall(Class_Point, rm_ID_new, 2
-                    , INT2FIX(p->x), INT2FIX(p->y));
+    return rb_funcall(Class_Point, rm_ID_new, 2,
+                      INT2FIX(p->x), INT2FIX(p->y));
 }
 
 
@@ -616,7 +575,7 @@ Import_PointInfo(PointInfo *p)
 void
 Export_PointInfo(PointInfo *pi, VALUE sp)
 {
-    volatile VALUE members, m;
+    VALUE members, m;
 
     if (CLASS_OF(sp) != Class_Point)
     {
@@ -628,6 +587,9 @@ Export_PointInfo(PointInfo *pi, VALUE sp)
     pi->x = m == Qnil ? 0.0 : NUM2DBL(m);
     m = rb_ary_entry(members, 1);
     pi->y = m == Qnil ? 0.0 : NUM2DBL(m);
+
+    RB_GC_GUARD(members);
+    RB_GC_GUARD(m);
 }
 
 
@@ -642,8 +604,8 @@ Export_PointInfo(PointInfo *pi, VALUE sp)
 VALUE
 Import_PrimaryInfo(PrimaryInfo *p)
 {
-    return rb_funcall(Class_Primary, rm_ID_new, 3
-                    , INT2FIX(p->x), INT2FIX(p->y), INT2FIX(p->z));
+    return rb_funcall(Class_Primary, rm_ID_new, 3,
+                      INT2FIX(p->x), INT2FIX(p->y), INT2FIX(p->z));
 }
 
 
@@ -658,7 +620,7 @@ Import_PrimaryInfo(PrimaryInfo *p)
 void
 Export_PrimaryInfo(PrimaryInfo *pi, VALUE sp)
 {
-    volatile VALUE members, m;
+    VALUE members, m;
 
     if (CLASS_OF(sp) != Class_Primary)
     {
@@ -672,17 +634,16 @@ Export_PrimaryInfo(PrimaryInfo *pi, VALUE sp)
     pi->y = m == Qnil ? 0.0 : NUM2DBL(m);
     m = rb_ary_entry(members, 2);
     pi->z = m == Qnil ? 0.0 : NUM2DBL(m);
+
+    RB_GC_GUARD(members);
+    RB_GC_GUARD(m);
 }
 
 
 /**
- * Create a string representation of a Magick::PrimaryInfo.
- *
- * Ruby usage:
- *   - @verbatim Magick::PrimaryInfo#to_s @endverbatim
+ * Return a string representation of a {Magick::PrimaryInfo} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 PrimaryInfo_to_s(VALUE self)
@@ -691,7 +652,7 @@ PrimaryInfo_to_s(VALUE self)
     char buff[100];
 
     Export_PrimaryInfo(&pi, self);
-    sprintf(buff, "x=%g, y=%g, z=%g", pi.x, pi.y, pi.z);
+    snprintf(buff, sizeof(buff), "x=%g, y=%g, z=%g", pi.x, pi.y, pi.z);
     return rb_str_new2(buff);
 }
 
@@ -707,16 +668,22 @@ PrimaryInfo_to_s(VALUE self)
 VALUE
 Import_RectangleInfo(RectangleInfo *rect)
 {
-    volatile VALUE width;
-    volatile VALUE height;
-    volatile VALUE x, y;
+    VALUE width;
+    VALUE height;
+    VALUE x, y;
 
     width  = UINT2NUM(rect->width);
     height = UINT2NUM(rect->height);
     x      = INT2NUM(rect->x);
     y      = INT2NUM(rect->y);
-    return rb_funcall(Class_Rectangle, rm_ID_new, 4
-                    , width, height, x, y);
+
+    RB_GC_GUARD(width);
+    RB_GC_GUARD(height);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+
+    return rb_funcall(Class_Rectangle, rm_ID_new, 4,
+                      width, height, x, y);
 }
 
 
@@ -731,7 +698,7 @@ Import_RectangleInfo(RectangleInfo *rect)
 void
 Export_RectangleInfo(RectangleInfo *rect, VALUE sr)
 {
-    volatile VALUE members, m;
+    VALUE members, m;
 
     if (CLASS_OF(sr) != Class_Rectangle)
     {
@@ -747,17 +714,16 @@ Export_RectangleInfo(RectangleInfo *rect, VALUE sr)
     rect->x      = m == Qnil ? 0 : NUM2LONG (m);
     m = rb_ary_entry(members, 3);
     rect->y      = m == Qnil ? 0 : NUM2LONG (m);
+
+    RB_GC_GUARD(members);
+    RB_GC_GUARD(m);
 }
 
 
 /**
- * Create a string representation of a Magick::Rectangle.
- *
- * Ruby usage:
- *   - @verbatim Magick::Rectangle#to_s @endverbatim
+ * Return a string representation of a {Magick::Rectangle} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 RectangleInfo_to_s(VALUE self)
@@ -766,8 +732,8 @@ RectangleInfo_to_s(VALUE self)
     char buff[100];
 
     Export_RectangleInfo(&rect, self);
-    sprintf(buff, "width=%lu, height=%lu, x=%ld, y=%ld"
-          , rect.width, rect.height, rect.x, rect.y);
+    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);
 }
 
@@ -783,12 +749,18 @@ RectangleInfo_to_s(VALUE self)
 VALUE
 Import_SegmentInfo(SegmentInfo *segment)
 {
-    volatile VALUE x1, y1, x2, y2;
+    VALUE x1, y1, x2, y2;
 
     x1 = rb_float_new(segment->x1);
     y1 = rb_float_new(segment->y1);
     x2 = rb_float_new(segment->x2);
     y2 = rb_float_new(segment->y2);
+
+    RB_GC_GUARD(x1);
+    RB_GC_GUARD(y1);
+    RB_GC_GUARD(x2);
+    RB_GC_GUARD(y2);
+    
     return rb_funcall(Class_Segment, rm_ID_new, 4, x1, y1, x2, y2);
 }
 
@@ -804,7 +776,7 @@ Import_SegmentInfo(SegmentInfo *segment)
 void
 Export_SegmentInfo(SegmentInfo *segment, VALUE s)
 {
-    volatile VALUE members, m;
+    VALUE members, m;
 
     if (CLASS_OF(s) != Class_Segment)
     {
@@ -821,17 +793,16 @@ Export_SegmentInfo(SegmentInfo *segment, VALUE s)
     segment->x2 = m == Qnil ? 0.0 : NUM2DBL(m);
     m = rb_ary_entry(members, 3);
     segment->y2 = m == Qnil ? 0.0 : NUM2DBL(m);
+
+    RB_GC_GUARD(members);
+    RB_GC_GUARD(m);
 }
 
 
 /**
- * Create a string representation of a Magick::Segment.
- *
- * Ruby usage:
- *   - @verbatim Magick::SegmentInfo#to_s @endverbatim
+ * Return a string representation of a {Magick::Segment} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 SegmentInfo_to_s(VALUE self)
@@ -840,98 +811,12 @@ SegmentInfo_to_s(VALUE self)
     char buff[100];
 
     Export_SegmentInfo(&segment, self);
-    sprintf(buff, "x1=%g, y1=%g, x2=%g, y2=%g"
-          , segment.x1, segment.y1, segment.x2, segment.y2);
+    snprintf(buff, sizeof(buff), "x1=%g, y1=%g, x2=%g, y2=%g",
+             segment.x1, segment.y1, segment.x2, segment.y2);
     return rb_str_new2(buff);
 }
 
 
-/**
- * Return the string representation of a StretchType value.
- *
- * No Ruby usage (internal function)
- *
- * @param stretch the StretchType value
- * @return the string
- */
-static const char *
-StretchType_name(StretchType stretch)
-{
-    switch (stretch)
-    {
-        ENUM_TO_NAME(UndefinedStretch)
-        ENUM_TO_NAME(NormalStretch)
-        ENUM_TO_NAME(UltraCondensedStretch)
-        ENUM_TO_NAME(ExtraCondensedStretch)
-        ENUM_TO_NAME(CondensedStretch)
-        ENUM_TO_NAME(SemiCondensedStretch)
-        ENUM_TO_NAME(SemiExpandedStretch)
-        ENUM_TO_NAME(ExpandedStretch)
-        ENUM_TO_NAME(ExtraExpandedStretch)
-        ENUM_TO_NAME(UltraExpandedStretch)
-        ENUM_TO_NAME(AnyStretch)
-    }
-
-    return "UndefinedStretch";
-}
-
-
-/**
- * Construct a StretchType enum for a specified StretchType value.
- *
- * No Ruby usage (internal function)
- *
- * @param stretch the C StretchType value
- * @return a Ruby StretchType enum
- */
-static VALUE
-StretchType_new(StretchType stretch)
-{
-    const char *name = StretchType_name(stretch);
-    return rm_enum_new(Class_StretchType, ID2SYM(rb_intern(name)), INT2FIX(stretch));
-}
-
-
-/**
- * Return the string representation of a StyleType value.
- *
- * No Ruby usage (internal function)
- *
- * @param style the StyleType value
- * @return the string
- */
-static const char *
-StyleType_name(StyleType style)
-{
-    switch (style)
-    {
-        ENUM_TO_NAME(UndefinedStyle)
-        ENUM_TO_NAME(NormalStyle)
-        ENUM_TO_NAME(ItalicStyle)
-        ENUM_TO_NAME(ObliqueStyle)
-        ENUM_TO_NAME(AnyStyle)
-    }
-
-    return "UndefinedStyle";
-}
-
-
-/**
- * Construct a StyleType enum for a specified StyleType value.
- *
- * No Ruby usage (internal function)
- *
- * @param style the C StyleType value
- * @return a Ruby StyleType enum
- */
-static VALUE
-StyleType_new(StyleType style)
-{
-    const char *name = StyleType_name(style);
-    return rm_enum_new(Class_StyleType, ID2SYM(rb_intern(name)), INT2FIX(style));
-}
-
-
 /**
  * Convert a TypeMetric structure to a Magick::TypeMetric.
  *
@@ -943,10 +828,10 @@ StyleType_new(StyleType style)
 VALUE
 Import_TypeMetric(TypeMetric *tm)
 {
-    volatile VALUE pixels_per_em;
-    volatile VALUE ascent, descent;
-    volatile VALUE width, height, max_advance;
-    volatile VALUE bounds, underline_position, underline_thickness;
+    VALUE pixels_per_em;
+    VALUE ascent, descent;
+    VALUE width, height, max_advance;
+    VALUE bounds, underline_position, underline_thickness;
 
     pixels_per_em       = Import_PointInfo(&tm->pixels_per_em);
     ascent              = rb_float_new(tm->ascent);
@@ -958,10 +843,20 @@ Import_TypeMetric(TypeMetric *tm)
     underline_position  = rb_float_new(tm->underline_position);
     underline_thickness = rb_float_new(tm->underline_position);
 
-    return rb_funcall(Class_TypeMetric, rm_ID_new, 9
-                    , pixels_per_em, ascent, descent, width
-                    , height, max_advance, bounds
-                    , underline_position, underline_thickness);
+    RB_GC_GUARD(pixels_per_em);
+    RB_GC_GUARD(ascent);
+    RB_GC_GUARD(descent);
+    RB_GC_GUARD(width);
+    RB_GC_GUARD(height);
+    RB_GC_GUARD(max_advance);
+    RB_GC_GUARD(bounds);
+    RB_GC_GUARD(underline_position);
+    RB_GC_GUARD(underline_thickness);
+
+    return rb_funcall(Class_TypeMetric, rm_ID_new, 9,
+                      pixels_per_em, ascent, descent, width,
+                      height, max_advance, bounds,
+                      underline_position, underline_thickness);
 }
 
 
@@ -976,8 +871,8 @@ Import_TypeMetric(TypeMetric *tm)
 void
 Export_TypeMetric(TypeMetric *tm, VALUE st)
 {
-    volatile VALUE members, m;
-    volatile VALUE pixels_per_em;
+    VALUE members, m;
+    VALUE pixels_per_em;
 
     if (CLASS_OF(st) != Class_TypeMetric)
     {
@@ -1007,41 +902,43 @@ Export_TypeMetric(TypeMetric *tm, VALUE st)
     tm->underline_position  = m == Qnil ? 0.0 : NUM2DBL(m);
     m = rb_ary_entry(members, 8);
     tm->underline_thickness = m == Qnil ? 0.0 : NUM2DBL(m);
+
+    RB_GC_GUARD(members);
+    RB_GC_GUARD(m);
+    RB_GC_GUARD(pixels_per_em);
 }
 
 
 /**
- * Create a string representation of a Magick::TypeMetric.
- *
- * Ruby usage:
- *   - @verbatim Magick::TypeMetric#to_s @endverbatim
+ * Return a string representation of a {Magick::TypeMetric} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 TypeMetric_to_s(VALUE self)
 {
-    volatile VALUE str;
+    VALUE str;
     TypeMetric tm;
     char temp[200];
     int len;
 
     Export_TypeMetric(&tm, self);
 
-    len = sprintf(temp, "pixels_per_em=(x=%g,y=%g) ", tm.pixels_per_em.x, tm.pixels_per_em.y);
+    len = snprintf(temp, sizeof(temp), "pixels_per_em=(x=%g,y=%g) ", tm.pixels_per_em.x, tm.pixels_per_em.y);
     str = rb_str_new(temp, len);
-    len = sprintf(temp, "ascent=%g descent=%g ",tm.ascent, tm.descent);
+    len = snprintf(temp, sizeof(temp), "ascent=%g descent=%g ",tm.ascent, tm.descent);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "width=%g height=%g max_advance=%g ", tm.width, tm.height, tm.max_advance);
+    len = snprintf(temp, sizeof(temp), "width=%g height=%g max_advance=%g ", tm.width, tm.height, tm.max_advance);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "bounds.x1=%g bounds.y1=%g ", tm.bounds.x1, tm.bounds.y1);
+    len = snprintf(temp, sizeof(temp), "bounds.x1=%g bounds.y1=%g ", tm.bounds.x1, tm.bounds.y1);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "bounds.x2=%g bounds.y2=%g ", tm.bounds.x2, tm.bounds.y2);
+    len = snprintf(temp, sizeof(temp), "bounds.x2=%g bounds.y2=%g ", tm.bounds.x2, tm.bounds.y2);
     rb_str_cat(str, temp, len);
-    len = sprintf(temp, "underline_position=%g underline_thickness=%g", tm.underline_position, tm.underline_thickness);
+    len = snprintf(temp, sizeof(temp), "underline_position=%g underline_thickness=%g", tm.underline_position, tm.underline_thickness);
     rb_str_cat(str, temp, len);
 
+    RB_GC_GUARD(str);
+
     return str;
 }