rmagick 1.15.3 → 1.15.4

data/ext/RMagick/rminfo.c

@@ -1,4 +1,4 @@
-/* $Id: rminfo.c,v 1.45.2.1 2007/02/17 14:18:13 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.45.2.2 2007/03/04 00:05:36 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rminfo.c
@@ -92,7 +92,7 @@ Info_aset(VALUE self, VALUE format, VALUE key, VALUE value)
     key_p = STRING_PTR_LEN(key, key_l);
 
     /* Allow any argument that supports to_s */
-    value = rb_funcall(value, ID_to_s, 0);
+    value = rb_funcall(value, rm_ID_to_s, 0);
     value_p = STRING_PTR(value);
 
     if (format_l > MAX_FORMAT_LEN || format_l+key_l > MaxTextExtent-1)
@@ -125,7 +125,7 @@ Info_aset(VALUE self, VALUE format, VALUE key, VALUE value)
 
     format_p = STRING_PTR_LEN(format, format_l);
     key_p = STRING_PTR_LEN(key, key_l);
-    value = rb_funcall(value, ID_to_s, 0);
+    value = rb_funcall(value, rm_ID_to_s, 0);
     value_p = STRING_PTR_LEN(value, value_l);
 
     if ((3 + format_l + key_l + value_l) > sizeof(definitions))
@@ -376,7 +376,7 @@ Info_define(int argc, VALUE *argv, VALUE self)
     {
         case 3:
             /* Allow any argument that supports to_s */
-            fmt_arg = rb_funcall(argv[2], ID_to_s, 0);
+            fmt_arg = rb_funcall(argv[2], rm_ID_to_s, 0);
             value = STRING_PTR(fmt_arg);
         case 2:
             key = STRING_PTR_LEN(argv[1], key_l);
@@ -418,7 +418,7 @@ Info_define(int argc, VALUE *argv, VALUE self)
     {
         case 3:
             /* Allow any argument that supports to_s */
-            fmt_arg = rb_funcall(argv[2], ID_to_s, 0);
+            fmt_arg = rb_funcall(argv[2], rm_ID_to_s, 0);
             value = STRING_PTR_LEN(fmt_arg, value_l);
             /* Fall through */
         case 2:
@@ -568,7 +568,7 @@ Info_density_eq(VALUE self, VALUE density_arg)
         return self;
     }
 
-    density = rb_funcall(density_arg, ID_to_s, 0);
+    density = rb_funcall(density_arg, rm_ID_to_s, 0);
     dens = STRING_PTR(density);
     if (!IsGeometry(dens))
     {
@@ -744,7 +744,7 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
         return self;
     }
 
-    extract = rb_funcall(extract_arg, ID_to_s, 0);
+    extract = rb_funcall(extract_arg, rm_ID_to_s, 0);
     extr = STRING_PTR(extract);
     if (!IsGeometry(extr))
     {
@@ -826,7 +826,7 @@ Info_tile_eq(VALUE self, VALUE tile_arg)
         return self;
     }
 
-    tile = rb_funcall(tile_arg, ID_to_s, 0);
+    tile = rb_funcall(tile_arg, rm_ID_to_s, 0);
     til = STRING_PTR(tile);
     if (!IsGeometry(til))
     {
@@ -1359,7 +1359,7 @@ Info_origin_eq(VALUE self, VALUE origin_arg)
         return self;
     }
 
-    origin_str = rb_funcall(origin_arg, ID_to_s, 0);
+    origin_str = rb_funcall(origin_arg, rm_ID_to_s, 0);
     origin = GetPageGeometry(STRING_PTR(origin_str));
 
     if (IsGeometry(origin) == MagickFalse)
@@ -1411,7 +1411,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
         info->page = NULL;
         return self;
     }
-    geom_str = rb_funcall(page_arg, ID_to_s, 0);
+    geom_str = rb_funcall(page_arg, rm_ID_to_s, 0);
     geometry=GetPageGeometry(STRING_PTR(geom_str));
     if (*geometry == '\0')
     {
@@ -1609,7 +1609,7 @@ Info_size_eq(VALUE self, VALUE size_arg)
         return self;
     }
 
-    size = rb_funcall(size_arg, ID_to_s, 0);
+    size = rb_funcall(size_arg, rm_ID_to_s, 0);
     sz = STRING_PTR(size);
     if (!IsGeometry(sz))
     {

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.159 2007/01/20 15:45:29 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.159.2.1 2007/03/04 00:05:36 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -472,7 +472,7 @@ monitor_handler(
         args[2] = UINT2NUM((unsigned long) span);
 
         monitor = rb_cvar_get(Module_Magick, Magick_Monitor);
-        (void) rb_funcall2((VALUE)monitor, ID_call, 3, (VALUE *)args);
+        (void) rb_funcall2((VALUE)monitor, rm_ID_call, 3, (VALUE *)args);
     }
 
     return True;
@@ -604,29 +604,29 @@ Init_RMagick(void)
     /* Create IDs for frequently used methods, etc.                          */
     /*-----------------------------------------------------------------------*/
 
-    ID__dummy_img_      = rb_intern("_dummy_img_");
-    ID_call             = rb_intern("call");
-    ID_changed          = rb_intern("changed");
-    ID_cur_image        = rb_intern("cur_image");
-    ID_dup              = rb_intern("dup");
-    ID_enumerators      = rb_intern("enumerators");
-    ID_fill             = rb_intern("fill");
-    ID_flag             = rb_intern("flag");
-    ID_from_s           = rb_intern("from_s");
-    ID_Geometry         = rb_intern("Geometry");
-    ID_GeometryValue    = rb_intern("GeometryValue");
-    ID_height           = rb_intern("height");
-    ID_initialize_copy  = rb_intern("initialize_copy");
-    ID_length           = rb_intern("length");
-    ID_notify_observers = rb_intern("notify_observers");
-    ID_new              = rb_intern("new");
-    ID_push             = rb_intern("push");
-    ID_spaceship        = rb_intern("<=>");
-    ID_to_s             = rb_intern("to_s");
-    ID_values           = rb_intern("values");
-    ID_width            = rb_intern("width");
-    ID_x                = rb_intern("x");
-    ID_y                = rb_intern("y");
+    rm_ID__dummy_img_      = rb_intern("_dummy_img_");
+    rm_ID_call             = rb_intern("call");
+    rm_ID_changed          = rb_intern("changed");
+    rm_ID_cur_image        = rb_intern("cur_image");
+    rm_ID_dup              = rb_intern("dup");
+    rm_ID_enumerators      = rb_intern("enumerators");
+    rm_ID_fill             = rb_intern("fill");
+    rm_ID_flag             = rb_intern("flag");
+    rm_ID_from_s           = rb_intern("from_s");
+    rm_ID_Geometry         = rb_intern("Geometry");
+    rm_ID_GeometryValue    = rb_intern("GeometryValue");
+    rm_ID_height           = rb_intern("height");
+    rm_ID_initialize_copy  = rb_intern("initialize_copy");
+    rm_ID_length           = rb_intern("length");
+    rm_ID_notify_observers = rb_intern("notify_observers");
+    rm_ID_new              = rb_intern("new");
+    rm_ID_push             = rb_intern("push");
+    rm_ID_spaceship        = rb_intern("<=>");
+    rm_ID_to_s             = rb_intern("to_s");
+    rm_ID_values           = rb_intern("values");
+    rm_ID_width            = rb_intern("width");
+    rm_ID_x                = rb_intern("x");
+    rm_ID_y                = rb_intern("y");
 
     /*-----------------------------------------------------------------------*/
     /* Module Magick methods                                                 */
@@ -1936,7 +1936,7 @@ static void version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-        "This is %s ($Date: 2007/01/20 15:45:29 $) Copyright (C) 2007 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2007/03/04 00:05:36 $) Copyright (C) 2007 by Timothy P. Hunter\n"
         "Built with %s\n"
         "Built for %s\n"
         "Web page: http://rmagick.rubyforge.org\n"

data/ext/RMagick/rmutil.c

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.90.2.1 2007/02/04 13:16:23 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.90.2.2 2007/03/04 00:05:37 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -437,7 +437,7 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
 VALUE
 ImageList_cur_image(VALUE img)
 {
-    return rb_funcall(img, ID_cur_image, 0);
+    return rb_funcall(img, rm_ID_cur_image, 0);
 }
 
 /*
@@ -956,7 +956,7 @@ Pixel_dup(VALUE self)
     {
         (void) rb_obj_taint(dup);
     }
-    return rb_funcall(dup, ID_initialize_copy, 1, self);
+    return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
 }
 
 
@@ -1122,7 +1122,7 @@ AffineMatrix_to_AffineMatrix(AffineMatrix *am, VALUE st)
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(st)));
     }
-    values = rb_funcall(st, ID_values, 0);
+    values = rb_funcall(st, rm_ID_values, 0);
     v = rb_ary_entry(values, 0);
     am->sx = v == Qnil ? 1.0 : NUM2DBL(v);
     v = rb_ary_entry(values, 1);
@@ -1803,7 +1803,7 @@ Color_from_ColorInfo(const ColorInfo *ci)
     color      = Pixel_from_PixelPacket((PixelPacket *)(&(ci->color)));
 #endif
 
-    return rb_funcall(Class_Color, ID_new, 3
+    return rb_funcall(Class_Color, rm_ID_new, 3
                     , name, compliance, color);
 }
 
@@ -1826,7 +1826,7 @@ Color_to_ColorInfo(ColorInfo *ci, VALUE st)
 
     memset(ci, '\0', sizeof(ColorInfo));
 
-    members = rb_funcall(st, ID_values, 0);
+    members = rb_funcall(st, rm_ID_values, 0);
 
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
@@ -1979,7 +1979,7 @@ Color_to_PixelPacket(PixelPacket *pp, VALUE color)
 VALUE
 PrimaryInfo_from_PrimaryInfo(PrimaryInfo *p)
 {
-    return rb_funcall(Class_Primary, ID_new, 3
+    return rb_funcall(Class_Primary, rm_ID_new, 3
                     , INT2FIX(p->x), INT2FIX(p->y), INT2FIX(p->z));
 }
 
@@ -1997,7 +1997,7 @@ PrimaryInfo_to_PrimaryInfo(PrimaryInfo *pi, VALUE sp)
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(sp)));
     }
-    members = rb_funcall(sp, ID_values, 0);
+    members = rb_funcall(sp, rm_ID_values, 0);
     m = rb_ary_entry(members, 0);
     pi->x = m == Qnil ? 0.0 : NUM2DBL(m);
     m = rb_ary_entry(members, 1);
@@ -2013,7 +2013,7 @@ PrimaryInfo_to_PrimaryInfo(PrimaryInfo *pi, VALUE sp)
 VALUE
 PointInfo_to_Point(PointInfo *p)
 {
-    return rb_funcall(Class_Point, ID_new, 2
+    return rb_funcall(Class_Point, rm_ID_new, 2
                     , INT2FIX(p->x), INT2FIX(p->y));
 }
 
@@ -2031,7 +2031,7 @@ Point_to_PointInfo(PointInfo *pi, VALUE sp)
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(sp)));
     }
-    members = rb_funcall(sp, ID_values, 0);
+    members = rb_funcall(sp, rm_ID_values, 0);
     m = rb_ary_entry(members, 0);
     pi->x = m == Qnil ? 0.0 : NUM2DBL(m);
     m = rb_ary_entry(members, 1);
@@ -2058,7 +2058,7 @@ ChromaticityInfo_new(ChromaticityInfo *ci)
     blue_primary  = PrimaryInfo_from_PrimaryInfo(&ci->blue_primary);
     white_point   = PrimaryInfo_from_PrimaryInfo(&ci->white_point);
 
-    return rb_funcall(Class_Chromaticity, ID_new, 4
+    return rb_funcall(Class_Chromaticity, rm_ID_new, 4
                     , red_primary, green_primary, blue_primary, white_point);
 }
 
@@ -2080,7 +2080,7 @@ ChromaticityInfo_to_ChromaticityInfo(ChromaticityInfo *ci, VALUE chrom)
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(chrom)));
     }
-    values_id = ID_values;
+    values_id = rm_ID_values;
 
     // Get the struct members in an array
     chrom_members = rb_funcall(chrom, values_id, 0);
@@ -2137,7 +2137,7 @@ Rectangle_from_RectangleInfo(RectangleInfo *rect)
     height = UINT2NUM(rect->height);
     x      = INT2NUM(rect->x);
     y      = INT2NUM(rect->y);
-    return rb_funcall(Class_Rectangle, ID_new, 4
+    return rb_funcall(Class_Rectangle, rm_ID_new, 4
                     , width, height, x, y);
 }
 
@@ -2155,7 +2155,7 @@ Rectangle_to_RectangleInfo(RectangleInfo *rect, VALUE sr)
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(sr)));
     }
-    members = rb_funcall(sr, ID_values, 0);
+    members = rb_funcall(sr, rm_ID_values, 0);
     m = rb_ary_entry(members, 0);
     rect->width  = m == Qnil ? 0 : NUM2ULONG(m);
     m = rb_ary_entry(members, 1);
@@ -2179,7 +2179,7 @@ Segment_from_SegmentInfo(SegmentInfo *segment)
     y1 = rb_float_new(segment->y1);
     x2 = rb_float_new(segment->x2);
     y2 = rb_float_new(segment->y2);
-    return rb_funcall(Class_Segment, ID_new, 4, x1, y1, x2, y2);
+    return rb_funcall(Class_Segment, rm_ID_new, 4, x1, y1, x2, y2);
 }
 
 /*
@@ -2197,7 +2197,7 @@ Segment_to_SegmentInfo(SegmentInfo *segment, VALUE s)
                  rb_class2name(CLASS_OF(s)));
     }
 
-    members = rb_funcall(s, ID_values, 0);
+    members = rb_funcall(s, rm_ID_values, 0);
     m = rb_ary_entry(members, 0);
     segment->x1 = m == Qnil ? 0.0 : NUM2DBL(m);
     m = rb_ary_entry(members, 1);
@@ -2256,7 +2256,7 @@ Font_from_TypeInfo(TypeInfo *ti)
     foundry     = ti->foundry     ? rb_str_new2(ti->foundry)  : Qnil;
     format      = ti->format      ? rb_str_new2(ti->format)   : Qnil;
 
-    return rb_funcall(Class_Font, ID_new, 9
+    return rb_funcall(Class_Font, rm_ID_new, 9
                     , name, description, family, style
                     , stretch, weight, encoding, foundry, format);
 }
@@ -2278,7 +2278,7 @@ Font_to_TypeInfo(TypeInfo *ti, VALUE st)
 
     memset(ti, '\0', sizeof(TypeInfo));
 
-    members = rb_funcall(st, ID_values, 0);
+    members = rb_funcall(st, rm_ID_values, 0);
     m = rb_ary_entry(members, 0);
     if (m != Qnil)
     {
@@ -2397,7 +2397,7 @@ TypeMetric_from_TypeMetric(TypeMetric *tm)
     underline_position  = rb_float_new(tm->underline_position);
     underline_thickness = rb_float_new(tm->underline_position);
 
-    return rb_funcall(Class_TypeMetric, ID_new, 9
+    return rb_funcall(Class_TypeMetric, rm_ID_new, 9
                     , pixels_per_em, ascent, descent, width
                     , height, max_advance, bounds
                     , underline_position, underline_thickness);
@@ -2418,7 +2418,7 @@ TypeMetric_to_TypeMetric(TypeMetric *tm, VALUE st)
         rb_raise(rb_eTypeError, "type mismatch: %s given",
                  rb_class2name(CLASS_OF(st)));
     }
-    members = rb_funcall(st, ID_values, 0);
+    members = rb_funcall(st, rm_ID_values, 0);
 
     pixels_per_em   = rb_ary_entry(members, 0);
     Point_to_PointInfo(&tm->pixels_per_em, pixels_per_em);
@@ -2648,7 +2648,7 @@ VALUE Enum_spaceship(VALUE self, VALUE other)
 
     // Values are equal, check class.
 
-    return rb_funcall(CLASS_OF(self), ID_spaceship, 1, CLASS_OF(other));
+    return rb_funcall(CLASS_OF(self), rm_ID_spaceship, 1, CLASS_OF(other));
 }
 
 
@@ -2686,13 +2686,13 @@ VALUE Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
     super_argv[1] = val;
     (void) rb_call_super(2, (VALUE *)super_argv);
 
-    if (rb_cvar_defined(CLASS_OF(self), ID_enumerators) != Qtrue)
+    if (rb_cvar_defined(CLASS_OF(self), rm_ID_enumerators) != Qtrue)
     {
-        RUBY18(rb_cvar_set(CLASS_OF(self), ID_enumerators, rb_ary_new(), 0));
-        RUBY16(rb_cvar_set(CLASS_OF(self), ID_enumerators, rb_ary_new()));
+        RUBY18(rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new(), 0));
+        RUBY16(rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new()));
     }
 
-    enumerators = rb_cvar_get(CLASS_OF(self), ID_enumerators);
+    enumerators = rb_cvar_get(CLASS_OF(self), rm_ID_enumerators);
     (void) rb_ary_push(enumerators, self);
 
     return self;
@@ -2726,7 +2726,7 @@ static VALUE Enum_type_values(VALUE class)
     volatile VALUE rv;
     int x;
 
-    enumerators = rb_cvar_get(class, ID_enumerators);
+    enumerators = rb_cvar_get(class, rm_ID_enumerators);
 
     if (rb_block_given_p())
     {
@@ -2811,30 +2811,30 @@ Statistics_new(ImageStatistics *stats)
     mean = rb_float_new(stats->red.mean);
     stddev = rb_float_new(stats->red.standard_deviation);
     var = rb_float_new(stats->red.variance);
-    red = rb_funcall(Class_StatisticsChannel, ID_new, 5, max, min, mean, stddev, var);
+    red = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
 
     min = rb_float_new(stats->green.minimum);
     max = rb_float_new(stats->green.maximum);
     mean = rb_float_new(stats->green.mean);
     stddev = rb_float_new(stats->green.standard_deviation);
     var = rb_float_new(stats->green.variance);
-    green = rb_funcall(Class_StatisticsChannel, ID_new, 5, max, min, mean, stddev, var);
+    green = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
 
     min = rb_float_new(stats->blue.minimum);
     max = rb_float_new(stats->blue.maximum);
     mean = rb_float_new(stats->blue.mean);
     stddev = rb_float_new(stats->blue.standard_deviation);
     var = rb_float_new(stats->blue.variance);
-    blue = rb_funcall(Class_StatisticsChannel, ID_new, 5, max, min, mean, stddev, var);
+    blue = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
 
     min = rb_float_new(stats->opacity.minimum);
     max = rb_float_new(stats->opacity.maximum);
     mean = rb_float_new(stats->opacity.mean);
     stddev = rb_float_new(stats->opacity.standard_deviation);
     var = rb_float_new(stats->opacity.variance);
-    opacity = rb_funcall(Class_StatisticsChannel, ID_new, 5, max, min, mean, stddev, var);
+    opacity = rb_funcall(Class_StatisticsChannel, rm_ID_new, 5, max, min, mean, stddev, var);
 
-    return rb_funcall(Class_Statistics, ID_new, 4, red, green, blue, opacity);
+    return rb_funcall(Class_Statistics, rm_ID_new, 4, red, green, blue, opacity);
 
 }
 #endif  // HAVE_GETIMAGESTATISTICS
@@ -2991,7 +2991,7 @@ rm_magick_error(const char *msg, const char *loc)
     mesg = rb_str_new2(msg);
     extra = loc ? rb_str_new2(loc) : Qnil;
 
-    exc = rb_funcall(Class_ImageMagickError, ID_new, 2, mesg, extra);
+    exc = rb_funcall(Class_ImageMagickError, rm_ID_new, 2, mesg, extra);
     (void) rb_funcall(rb_cObject, rb_intern("raise"), 1, exc);
 }
 
@@ -3044,13 +3044,13 @@ rm_get_geometry(
 {
     VALUE v;
 
-    v = rb_funcall(geom, ID_x, 0);
+    v = rb_funcall(geom, rm_ID_x, 0);
     *x = NUM2LONG(v);
-    v = rb_funcall(geom, ID_y, 0);
+    v = rb_funcall(geom, rm_ID_y, 0);
     *y = NUM2LONG(v);
-    v = rb_funcall(geom, ID_width, 0);
+    v = rb_funcall(geom, rm_ID_width, 0);
     *width = NUM2ULONG(v);
-    v = rb_funcall(geom, ID_height, 0);
+    v = rb_funcall(geom, rm_ID_height, 0);
     *height = NUM2ULONG(v);
 
     // Getting the flag field is a bit more difficult since it's
@@ -3061,10 +3061,10 @@ rm_get_geometry(
     {
         MagickEnum *magick_enum;
 
-        v = rb_funcall(geom, ID_flag, 0);
+        v = rb_funcall(geom, rm_ID_flag, 0);
         if (!Class_GeometryValue)
         {
-            Class_GeometryValue = rb_const_get(Module_Magick, ID_GeometryValue);
+            Class_GeometryValue = rb_const_get(Module_Magick, rm_ID_GeometryValue);
         }
         if (CLASS_OF(v) != Class_GeometryValue)
         {
@@ -3125,7 +3125,7 @@ MagickBooleanType rm_progress_monitor(
 
     method = rb_str_new2(rb_id2name(rb_frame_last_func()));
 
-    rval = rb_funcall((VALUE)client_data, ID_call, 3, method, offset, span);
+    rval = rb_funcall((VALUE)client_data, rm_ID_call, 3, method, offset, span);
 
     return RTEST(rval) ? MagickTrue : MagickFalse;
 }