[cairo-commit] rcairo/packages/cairo/ext rb_cairo_context.c, 1.15, 1.16 rb_cairo_matrix.c, 1.13, 1.14 rb_cairo_private.c, 1.1, 1.2 rb_cairo_private.h, 1.1, 1.2 rb_cairo_scaled_font.c, 1.1, 1.2

Kouhei Sutou commit at pdx.freedesktop.org
Mon Oct 10 08:29:48 PDT 2005


Committed by: kou

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

Modified Files:
	rb_cairo_context.c rb_cairo_matrix.c rb_cairo_private.c 
	rb_cairo_private.h rb_cairo_scaled_font.c 
Log Message:
* packages/cairo/ext/rb_cairo_private.c: Changed prefix to
  'rb_cairo__' from 'cr__'.
* packages/cairo/ext/rb_cairo_matrix.c: ditto.
* packages/cairo/ext/rb_cairo_context.c: ditto.
* packages/cairo/ext/rb_cairo_private.h: ditto.


Index: rb_cairo_context.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_context.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rb_cairo_context.c	9 Oct 2005 14:49:39 -0000	1.15
+++ rb_cairo_context.c	10 Oct 2005 15:29:46 -0000	1.16
@@ -407,7 +407,7 @@
   pair[1] = NUM2DBL (y);
   cairo_user_to_device (_SELF, pair, pair + 1);
   cr_check_status (_SELF);
-  return cr__float_array (pair, 2);
+  return rb_cairo__float_array (pair, 2);
 }
 
 static VALUE
@@ -418,7 +418,7 @@
   pair[1] = NUM2DBL (dy);
   cairo_user_to_device_distance (_SELF, pair, pair + 1);
   cr_check_status (_SELF);
-  return cr__float_array (pair, 2);
+  return rb_cairo__float_array (pair, 2);
 }
 
 static VALUE
@@ -429,7 +429,7 @@
   pair[1] = NUM2DBL (y);
   cairo_device_to_user (_SELF, pair, pair + 1);
   cr_check_status (_SELF);
-  return cr__float_array (pair, 2);
+  return rb_cairo__float_array (pair, 2);
 }
 
 static VALUE
@@ -440,7 +440,7 @@
   pair[1] = NUM2DBL (dy);
   cairo_device_to_user_distance (_SELF, pair, pair + 1);
   cr_check_status (_SELF);
-  return cr__float_array (pair, 2);
+  return rb_cairo__float_array (pair, 2);
 }
 
 
@@ -725,7 +725,7 @@
       rb_yield (self);
     }
   cairo_stroke_extents (_SELF, extents, extents + 1, extents + 2, extents + 3);
-  return cr__float_array (extents, 4);
+  return rb_cairo__float_array (extents, 4);
 }
 
 static VALUE
@@ -738,7 +738,7 @@
       rb_yield (self);
     }
   cairo_fill_extents (_SELF, extents, extents + 1, extents + 2, extents + 3);
-  return cr__float_array (extents, 4);
+  return rb_cairo__float_array (extents, 4);
 }
 
 /* Clipping */
@@ -850,7 +850,7 @@
   if (!rb_obj_is_kind_of (rb_glyphs, rb_cArray))
      rb_raise (rb_eTypeError, "expected array");
     
-  cr__glyphs_to_array (rb_glyphs, &glyphs, &count);
+  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &count);
   cairo_show_glyphs (_SELF, glyphs, count);
   cr_check_status (_SELF);
   return self;
@@ -899,7 +899,7 @@
   cairo_glyph_t *glyphs;
   int length;
 
-  cr__glyphs_to_array (rb_glyphs, &glyphs, &length);
+  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &length);
   cairo_glyph_extents (_SELF, glyphs, length, &extents);
   cr_check_status (_SELF);
   return CRTEXTEXTENTS2RVAL (&extents);
@@ -919,7 +919,7 @@
   int count;
   cairo_glyph_t *glyphs;
 
-  cr__glyphs_to_array (rb_glyphs, &glyphs, &count);
+  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &count);
   cairo_glyph_path (_SELF, glyphs, count);
   cr_check_status (_SELF);
   
@@ -957,7 +957,7 @@
 static VALUE
 cr_get_antialias(VALUE self)
 {
-  return INT2NUM(cairo_get_antialias(_SELF));
+  return INT2NUM (cairo_get_antialias(_SELF));
 }
 
 static VALUE
@@ -965,7 +965,7 @@
 {
   double point[2];
   cairo_get_current_point (_SELF, point, point + 1);
-  return cr__float_array (point, 2);
+  return rb_cairo__float_array (point, 2);
 }
 
 static VALUE

Index: rb_cairo_matrix.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_matrix.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rb_cairo_matrix.c	9 Oct 2005 15:56:38 -0000	1.13
+++ rb_cairo_matrix.c	10 Oct 2005 15:29:46 -0000	1.14
@@ -157,7 +157,7 @@
   pair[0] = NUM2DBL (dx);
   pair[1] = NUM2DBL (dy);
   cairo_matrix_transform_distance (_SELF, pair, pair + 1);
-  return cr__float_array (pair, 2);
+  return rb_cairo__float_array (pair, 2);
 }
 
 static VALUE
@@ -167,7 +167,7 @@
   pair[0] = NUM2DBL (x);
   pair[1] = NUM2DBL (y);
   cairo_matrix_transform_point (_SELF, pair, pair + 1);
-  return cr__float_array (pair, 2);
+  return rb_cairo__float_array (pair, 2);
 }
 
 
@@ -196,22 +196,20 @@
   affine[3] = matrix->yy;
   affine[4] = matrix->x0;
   affine[5] = matrix->y0;
-  return cr__float_array (affine, 6);
+  return rb_cairo__float_array (affine, 6);
 }
 
 static VALUE
 cr_matrix_to_s(VALUE self)
 {
-  cairo_matrix_t *matrix;
   VALUE ret;
 
-  matrix = _SELF;
-
-  ret = rb_str_new2 ("<");
+  ret = rb_str_new2 ("#<");
   rb_str_cat2 (ret, rb_class2name (CLASS_OF (self)));
   rb_str_cat2 (ret, ":");
   rb_str_concat (ret, rb_inspect (cr_matrix_to_a (self)));
   rb_str_cat2 (ret, ">");
+  
   return ret;
 }
 

Index: rb_cairo_private.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_private.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_private.c	9 Oct 2005 14:49:39 -0000	1.1
+++ rb_cairo_private.c	10 Oct 2005 15:29:46 -0000	1.2
@@ -11,7 +11,7 @@
 #include "rb_cairo.h"
 
 VALUE
-cr__float_array (double *values, unsigned count)
+rb_cairo__float_array (double *values, unsigned count)
 {
   VALUE result;
   int i;
@@ -25,7 +25,7 @@
 }
 
 void
-cr__glyphs_to_array (VALUE rb_array, cairo_glyph_t **glyphs, int *length)
+rb_cairo__glyphs_to_array (VALUE rb_array, cairo_glyph_t **glyphs, int *length)
 {
   int i;
   

Index: rb_cairo_private.h
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_private.h	9 Oct 2005 14:49:39 -0000	1.1
+++ rb_cairo_private.h	10 Oct 2005 15:29:46 -0000	1.2
@@ -11,7 +11,7 @@
 #ifndef RB_CAIRO_PRIVATE_H
 #define RB_CAIRO_PRIVATE_H
 
-VALUE cr__float_array (double *values, unsigned count);
-void cr__glyphs_to_array (VALUE rb_array, cairo_glyph_t **glyphs, int *length);
+VALUE rb_cairo__float_array (double *values, unsigned count);
+void rb_cairo__glyphs_to_array (VALUE rb_array, cairo_glyph_t **glyphs, int *length);
 
 #endif

Index: rb_cairo_scaled_font.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_scaled_font.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_scaled_font.c	9 Oct 2005 14:49:39 -0000	1.1
+++ rb_cairo_scaled_font.c	10 Oct 2005 15:29:46 -0000	1.2
@@ -95,7 +95,7 @@
   cairo_glyph_t *glyphs;
   int count;
 
-  cr__glyphs_to_array (rb_glyphs, &glyphs, &count);
+  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &count);
   cairo_scaled_font_glyph_extents (_SELF (self), glyphs, count, &extents);
   cr_scaled_font_check_status (_SELF (self));
   return CRTEXTEXTENTS2RVAL (&extents);



More information about the cairo-commit mailing list