[cairo-commit] rcairo/packages/cairo/ext rb_cairo_context.c, 1.16, 1.17 rb_cairo_font_face.c, 1.5, 1.6 rb_cairo_glyph.c, 1.6, 1.7 rb_cairo_matrix.c, 1.14, 1.15

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo/packages/cairo/ext
In directory gabe:/tmp/cvs-serv32610/packages/cairo/ext

Modified Files:
	rb_cairo_context.c rb_cairo_font_face.c rb_cairo_glyph.c 
	rb_cairo_matrix.c 
Log Message:
* packages/cairo/ext/rb_cairo_context.c: Renamed 'xform'.
* packages/cairo/ext/rb_cairo_font_face.c: ditto.
* packages/cairo/ext/rb_cairo_glyph.c: ditto.
* packages/cairo/ext/rb_cairo_matrix.c: ditto.


Index: rb_cairo_context.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_context.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- rb_cairo_context.c	10 Oct 2005 15:29:46 -0000	1.16
+++ rb_cairo_context.c	10 Oct 2005 15:32:52 -0000	1.17
@@ -376,17 +376,17 @@
 }
 
 static VALUE
-cr_transform (VALUE self, VALUE xform)
+cr_transform (VALUE self, VALUE matrix)
 {
-  cairo_transform (_SELF, RVAL2CRMATRIX (xform));
+  cairo_transform (_SELF, RVAL2CRMATRIX (matrix));
   cr_check_status (_SELF);
   return self;
 }
 
 static VALUE
-cr_set_matrix (VALUE self, VALUE xform)
+cr_set_matrix (VALUE self, VALUE matrix)
 {
-  cairo_set_matrix (_SELF, RVAL2CRMATRIX (xform));
+  cairo_set_matrix (_SELF, RVAL2CRMATRIX (matrix));
   cr_check_status (_SELF);
   return self;
 }
@@ -859,11 +859,11 @@
 static VALUE
 cr_get_font_face (VALUE self)
 {
-  cairo_font_face_t *xform;
+  cairo_font_face_t *face;
   
-  xform = cairo_get_font_face (_SELF);
+  face = cairo_get_font_face (_SELF);
   cr_check_status (_SELF);
-  return CRFONTFACE2RVAL (xform);
+  return CRFONTFACE2RVAL (face);
 }
 
 static VALUE
@@ -876,9 +876,9 @@
 }
 
 static VALUE
-cr_set_font_face (VALUE self, VALUE xform)
+cr_set_font_face (VALUE self, VALUE face)
 {
-  cairo_set_font_face (_SELF, RVAL2CRFONTFACE (xform));
+  cairo_set_font_face (_SELF, RVAL2CRFONTFACE (face));
   cr_check_status (_SELF);
   return self;
 }

Index: rb_cairo_font_face.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_font_face.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rb_cairo_font_face.c	7 Oct 2005 14:08:13 -0000	1.5
+++ rb_cairo_font_face.c	10 Oct 2005 15:32:52 -0000	1.6
@@ -19,13 +19,13 @@
 cairo_font_face_t *
 rb_cairo_font_face_from_ruby_object (VALUE obj)
 {
-  cairo_font_face_t *xform;
+  cairo_font_face_t *face;
   if (!RTEST (rb_obj_is_kind_of (obj, rb_cCairo_FontFace)))
     {
       rb_raise (rb_eTypeError, "not a cairo font face");
     }
-  Data_Get_Struct (obj, cairo_font_face_t, xform);
-  return xform;
+  Data_Get_Struct (obj, cairo_font_face_t, face);
+  return face;
 }
 
 VALUE

Index: rb_cairo_glyph.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_glyph.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rb_cairo_glyph.c	10 Oct 2005 15:25:31 -0000	1.6
+++ rb_cairo_glyph.c	10 Oct 2005 15:32:52 -0000	1.7
@@ -19,13 +19,13 @@
 cairo_glyph_t *
 rb_cairo_glyph_from_ruby_object (VALUE obj)
 {
-  cairo_glyph_t *xform;
+  cairo_glyph_t *glyph;
   if (!RTEST (rb_obj_is_kind_of (obj, rb_cCairo_Glyph)))
     {
       rb_raise (rb_eTypeError, "not a cairo glyph");
     }
-  Data_Get_Struct (obj, cairo_glyph_t, xform);
-  return xform;
+  Data_Get_Struct (obj, cairo_glyph_t, glyph);
+  return glyph;
 }
 
 static void

Index: rb_cairo_matrix.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_matrix.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rb_cairo_matrix.c	10 Oct 2005 15:29:46 -0000	1.14
+++ rb_cairo_matrix.c	10 Oct 2005 15:32:52 -0000	1.15
@@ -20,13 +20,13 @@
 cairo_matrix_t *
 rb_cairo_matrix_from_ruby_object (VALUE obj)
 {
-  cairo_matrix_t *xform;
+  cairo_matrix_t *matrix;
   if (!RTEST (rb_obj_is_kind_of (obj, rb_cCairo_Matrix)))
     {
       rb_raise (rb_eTypeError, "not a cairo matrix");
     }
-  Data_Get_Struct (obj, cairo_matrix_t, xform);
-  return xform;
+  Data_Get_Struct (obj, cairo_matrix_t, matrix);
+  return matrix;
 }
 
 static void