ext/RMagick/rminfo.c in rmagick-1.15.3 vs ext/RMagick/rminfo.c in rmagick-1.15.4

@@ -1,6 +1,6 @@
-/* $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
 | Author:   Tim Hunter
 | Purpose:  Info class method definitions for RMagick.
@@ -90,11 +90,11 @@
 
     format_p = STRING_PTR_LEN(format, format_l);
     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)
     {
         rb_raise(rb_eArgError, "%.60s:%.1024s not defined - too long", format_p, key_p);
@@ -123,11 +123,11 @@
 
     Data_Get_Struct(self, Info, info);
 
     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))
     {
         rb_raise(rb_eArgError, "%.60s:%.1024s not defined - too long", format_p, key_p);
@@ -374,11 +374,11 @@
 
     switch(argc)
     {
         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);
             format = STRING_PTR_LEN(argv[0], format_l);
             break;
@@ -416,11 +416,11 @@
 
     switch(argc)
     {
         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:
             key = STRING_PTR_LEN(argv[1], key_l);
             format = STRING_PTR_LEN(argv[0], format_l);
@@ -566,11 +566,11 @@
         magick_free(info->density);
         info->density = NULL;
         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))
     {
         rb_raise(rb_eArgError, "invalid density geometry: %s", dens);
     }
@@ -742,11 +742,11 @@
         magick_free(info->extract);
         info->extract = NULL;
         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))
     {
         rb_raise(rb_eArgError, "invalid extract geometry: %s", extr);
     }
@@ -824,11 +824,11 @@
         magick_free(info->tile);
         info->tile = NULL;
         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))
     {
         rb_raise(rb_eArgError, "invalid tile geometry: %s", til);
     }
@@ -1357,11 +1357,11 @@
     {
         (void) RemoveImageOption(info, "origin");
         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)
     {
         rb_raise(rb_eArgError, "invalid origin geometry: %s", origin);
@@ -1409,11 +1409,11 @@
     {
         magick_free(info->page);
         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')
     {
         magick_free(info->page);
         info->page = NULL;
@@ -1607,10 +1607,10 @@
         magick_free(info->size);
         info->size = NULL;
         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))
     {
         rb_raise(rb_eArgError, "invalid size geometry: %s", sz);
     }