Skip to content

Commit

Permalink
Add rm_ prefix to all external variables that start with ID_ (fix bug…
Browse files Browse the repository at this point in the history 
… #8927)
  • Loading branch information
rmagick committed Mar 4, 2007
1 parent 547d1d3 commit 17880f7
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 117 deletions.
56 changes: 28 additions & 28 deletions ext/RMagick/rmagick.h
View file
@@ -1,4 +1,4 @@
/* $Id: rmagick.h,v 1.170 2007/02/18 16:46:57 rmagick Exp $ */
/* $Id: rmagick.h,v 1.171 2007/03/04 01:17:41 rmagick Exp $ */
/*=============================================================================
| Copyright (C) 2006 by Timothy P. Hunter
| Name: rmagick.h
Expand Down Expand Up @@ -249,29 +249,29 @@ EXTERN VALUE Class_VirtualPixelMethod;
/*
* Commonly-used IDs
*/
EXTERN ID ID__dummy_img_; // "_dummy_img_"
EXTERN ID ID_call; // "call"
EXTERN ID ID_changed; // "changed"
EXTERN ID ID_cur_image; // "cur_image"
EXTERN ID ID_dup; // "dup"
EXTERN ID ID_enumerators; // "enumerators"
EXTERN ID ID_fill; // "fill"
EXTERN ID ID_flag; // "flag"
EXTERN ID ID_from_s; // "from_s"
EXTERN ID ID_Geometry; // "Geometry"
EXTERN ID ID_GeometryValue; // "GeometryValue"
EXTERN ID ID_height; // "height"
EXTERN ID ID_initialize_copy; // "initialize_copy"
EXTERN ID ID_length; // "length"
EXTERN ID ID_notify_observers; // "notify_observers"
EXTERN ID ID_new; // "new"
EXTERN ID ID_push; // "push"
EXTERN ID ID_spaceship; // "<=>
EXTERN ID ID_to_s; // "to_s"
EXTERN ID ID_values; // "values"
EXTERN ID ID_width; // "width"
EXTERN ID ID_x; // "x"
EXTERN ID ID_y; // "y"
EXTERN ID rm_ID__dummy_img_; // "_dummy_img_"
EXTERN ID rm_ID_call; // "call"
EXTERN ID rm_ID_changed; // "changed"
EXTERN ID rm_ID_cur_image; // "cur_image"
EXTERN ID rm_ID_dup; // "dup"
EXTERN ID rm_ID_enumerators; // "enumerators"
EXTERN ID rm_ID_fill; // "fill"
EXTERN ID rm_ID_flag; // "flag"
EXTERN ID rm_ID_from_s; // "from_s"
EXTERN ID rm_ID_Geometry; // "Geometry"
EXTERN ID rm_ID_GeometryValue; // "GeometryValue"
EXTERN ID rm_ID_height; // "height"
EXTERN ID rm_ID_initialize_copy; // "initialize_copy"
EXTERN ID rm_ID_length; // "length"
EXTERN ID rm_ID_notify_observers; // "notify_observers"
EXTERN ID rm_ID_new; // "new"
EXTERN ID rm_ID_push; // "push"
EXTERN ID rm_ID_spaceship; // "<=>
EXTERN ID rm_ID_to_s; // "to_s"
EXTERN ID rm_ID_values; // "values"
EXTERN ID rm_ID_width; // "width"
EXTERN ID rm_ID_x; // "x"
EXTERN ID rm_ID_y; // "y"


#define min(a,b) ((a)<(b)?(a):(b))
Expand Down Expand Up @@ -394,8 +394,8 @@ Pixel_##_channel_##_eq(VALUE self, VALUE v) \
rm_check_frozen(self); \
Data_Get_Struct(self, Pixel, pixel); \
pixel->_channel_ = (Quantum) NUM2UINT(v); \
(void) rb_funcall(self, ID_changed, 0); \
(void) rb_funcall(self, ID_notify_observers, 1, self); \
(void) rb_funcall(self, rm_ID_changed, 0); \
(void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
return UINT2NUM((unsigned int)(pixel->_channel_)); \
}

Expand All @@ -412,8 +412,8 @@ Pixel_##_cmyk_channel_##_eq(VALUE self, VALUE v) \
rm_check_frozen(self); \
Data_Get_Struct(self, Pixel, pixel); \
pixel->_rgb_channel_ = (Quantum) NUM2UINT(v); \
(void) rb_funcall(self, ID_changed, 0); \
(void) rb_funcall(self, ID_notify_observers, 1, self); \
(void) rb_funcall(self, rm_ID_changed, 0); \
(void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
return UINT2NUM((unsigned int)pixel->_rgb_channel_); \
} \
\
Expand Down
16 changes: 8 additions & 8 deletions ext/RMagick/rmdraw.c
View file
@@ -1,4 +1,4 @@
/* $Id: rmdraw.c,v 1.47 2007/02/18 16:46:57 rmagick Exp $ */
/* $Id: rmdraw.c,v 1.48 2007/03/04 01:17:41 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2007 by Timothy P. Hunter
| Name: rmdraw.c
Expand Down Expand Up @@ -713,7 +713,7 @@ Draw_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);
}


Expand Down Expand Up @@ -1060,7 +1060,7 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
volatile VALUE frame;

Data_Get_Struct(self, Montage, montage);
frame = rb_funcall(frame_arg, ID_to_s, 0);
frame = rb_funcall(frame_arg, rm_ID_to_s, 0);
magick_clone_string(&montage->info->frame, STRING_PTR(frame));

return self;
Expand All @@ -1077,7 +1077,7 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
volatile VALUE geometry;

Data_Get_Struct(self, Montage, montage);
geometry = rb_funcall(geometry_arg, ID_to_s, 0);
geometry = rb_funcall(geometry_arg, rm_ID_to_s, 0);
magick_clone_string(&montage->info->geometry, STRING_PTR(geometry));

return self;
Expand Down Expand Up @@ -1273,7 +1273,7 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
volatile VALUE tile;

Data_Get_Struct(self, Montage, montage);
tile = rb_funcall(tile_arg, ID_to_s, 0);
tile = rb_funcall(tile_arg, rm_ID_to_s, 0);
magick_clone_string(&montage->info->tile, STRING_PTR(tile));

return self;
Expand Down Expand Up @@ -1379,7 +1379,7 @@ static VALUE get_dummy_tm_img(VALUE klass)
Info *info;
Image *image;

if (rb_cvar_defined(klass, ID__dummy_img_) != Qtrue)
if (rb_cvar_defined(klass, rm_ID__dummy_img_) != Qtrue)
{

info = CloneImageInfo(NULL);
Expand All @@ -1395,9 +1395,9 @@ static VALUE get_dummy_tm_img(VALUE klass)
(void) DestroyImageInfo(info);
dummy_img = rm_image_new(image);

rb_cvar_set(klass, ID__dummy_img_, dummy_img, 0);
rb_cvar_set(klass, rm_ID__dummy_img_, dummy_img, 0);
}
dummy_img = rb_cvar_get(klass, ID__dummy_img_);
dummy_img = rb_cvar_get(klass, rm_ID__dummy_img_);

return dummy_img;
}
Expand Down
8 changes: 4 additions & 4 deletions ext/RMagick/rmilist.c
View file
@@ -1,4 +1,4 @@
/* $Id: rmilist.c,v 1.48 2007/02/16 00:15:14 rmagick Exp $ */
/* $Id: rmilist.c,v 1.49 2007/03/04 01:17:41 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2007 by Timothy P. Hunter
| Name: rmilist.c
Expand Down Expand Up @@ -482,7 +482,7 @@ ImageList_optimize_layers(VALUE self, VALUE method)
VALUE
rm_imagelist_new()
{
return rb_funcall(Class_ImageList, ID_new, 0);
return rb_funcall(Class_ImageList, rm_ID_new, 0);
}


Expand Down Expand Up @@ -568,7 +568,7 @@ rm_imagelist_length(VALUE imagelist)
{
volatile VALUE len;

len = rb_funcall(imagelist, ID_length, 0);
len = rb_funcall(imagelist, rm_ID_length, 0);
return FIX2INT(len);
}

Expand All @@ -580,7 +580,7 @@ void
rm_imagelist_push(VALUE imagelist, VALUE image)
{
rm_check_frozen(imagelist);
(void) rb_funcall(imagelist, ID_push, 1, image);
(void) rb_funcall(imagelist, rm_ID_push, 1, image);
}

/*
Expand Down
20 changes: 10 additions & 10 deletions ext/RMagick/rmimage.c
View file
@@ -1,4 +1,4 @@
/* $Id: rmimage.c,v 1.215 2007/02/18 16:48:47 rmagick Exp $ */
/* $Id: rmimage.c,v 1.216 2007/03/04 01:17:42 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2007 by Timothy P. Hunter
| Name: rmimage.c
Expand Down Expand Up @@ -1448,7 +1448,7 @@ Image_change_geometry(VALUE self, VALUE geom_arg)
volatile VALUE ary;

Data_Get_Struct(self, Image, image);
geom_str = rb_funcall(geom_arg, ID_to_s, 0);
geom_str = rb_funcall(geom_arg, rm_ID_to_s, 0);
geometry = STRING_PTR(geom_str);

flags = ParseSizeGeometry(image, geometry, &rect);
Expand Down Expand Up @@ -2851,7 +2851,7 @@ Image_convolve_channel(
VALUE
Image_copy(VALUE self)
{
return rb_funcall(self, ID_dup, 0);
return rb_funcall(self, rm_ID_dup, 0);
}

/*
Expand Down Expand Up @@ -2957,15 +2957,15 @@ Image_density_eq(VALUE self, VALUE density_arg)
// Get the Class ID for the Geometry class.
if (!Class_Geometry)
{
Class_Geometry = rb_const_get(Module_Magick, ID_Geometry);
Class_Geometry = rb_const_get(Module_Magick, rm_ID_Geometry);
}

// Geometry object. Width and height attributes are always positive.
if (CLASS_OF(density_arg) == Class_Geometry)
{
x_val = rb_funcall(density_arg, ID_width, 0);
x_val = rb_funcall(density_arg, rm_ID_width, 0);
x_res = NUM2DBL(x_val);
y_val = rb_funcall(density_arg, ID_height, 0);
y_val = rb_funcall(density_arg, rm_ID_height, 0);
y_res = NUM2DBL(y_val);
if(x_res == 0.0)
{
Expand Down Expand Up @@ -3455,7 +3455,7 @@ Image_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);
}

/*
Expand Down Expand Up @@ -4423,7 +4423,7 @@ Image_geometry_eq(
}


geom_str = rb_funcall(geometry, ID_to_s, 0);
geom_str = rb_funcall(geometry, rm_ID_to_s, 0);
geom = STRING_PTR(geom_str);
if (!IsGeometry(geom))
{
Expand Down Expand Up @@ -5847,7 +5847,7 @@ Image_initialize(int argc, VALUE *argv, VALUE self)
// fillobj.fill(self)
else
{
(void) rb_funcall(fill, ID_fill, 1, self);
(void) rb_funcall(fill, rm_ID_fill, 1, self);
}

return self;
Expand Down Expand Up @@ -6818,7 +6818,7 @@ Image_random_threshold_channel(
}

// Accept any argument that has a to_s method.
geom_str = rb_funcall(argv[0], ID_to_s, 0);
geom_str = rb_funcall(argv[0], rm_ID_to_s, 0);
thresholds = STRING_PTR(geom_str);

new_image = rm_clone_image(image);
Expand Down
16 changes: 8 additions & 8 deletions ext/RMagick/rminfo.c
View file
@@ -1,4 +1,4 @@
/* $Id: rminfo.c,v 1.55 2007/02/17 22:19:28 rmagick Exp $ */
/* $Id: rminfo.c,v 1.56 2007/03/04 01:17:42 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2007 by Timothy P. Hunter
| Name: rminfo.c
Expand Down Expand Up @@ -212,7 +212,7 @@ Info_aset(int argc, VALUE *argv, VALUE self)
else
{
/* 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);

(void) RemoveImageOption(info, ckey);
Expand Down Expand Up @@ -441,7 +441,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);
Expand Down Expand Up @@ -565,7 +565,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))
{
Expand Down Expand Up @@ -727,7 +727,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))
{
Expand Down Expand Up @@ -1222,7 +1222,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)
Expand Down Expand Up @@ -1265,7 +1265,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')
{
Expand Down Expand Up @@ -1461,7 +1461,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))
{
Expand Down

0 comments on commit 17880f7

Please sign in to comment.