[cairo-commit] rcairo/src rb_cairo_context.c, 1.8, 1.9 rb_cairo_font_extents.c, 1.1, 1.2 rb_cairo_glyph.c, 1.1, 1.2 rb_cairo_pattern.c, 1.3, 1.4

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo/src
In directory kemper:/tmp/cvs-serv14490/src

Modified Files:
	rb_cairo_context.c rb_cairo_font_extents.c rb_cairo_glyph.c 
	rb_cairo_pattern.c 
Log Message:
* cleanup.


Index: rb_cairo_context.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_context.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rb_cairo_context.c	30 Apr 2007 10:48:09 -0000	1.8
+++ rb_cairo_context.c	1 May 2007 12:03:21 -0000	1.9
@@ -747,7 +747,7 @@
 
   n = rb_scan_args (argc, argv, "01", &alpha);
 
-  if (n == 0 || (n == 1 && NIL_P(alpha)))
+  if (n == 0 || (n == 1 && NIL_P (alpha)))
     {
       return cr_paint (self);
     }
@@ -1004,12 +1004,12 @@
   else
     weight = RVAL2CRFONTWEIGHT (rb_weight);
 
-  cairo_select_font_face (_SELF, StringValueCStr (family), slant, weight);
+  cairo_select_font_face (_SELF, RVAL2CSTR (family), slant, weight);
   cr_check_status (_SELF);
   return self;
 }
 
-static   VALUE
+static VALUE
 cr_set_font_size (VALUE self, VALUE scale)
 {
   cairo_set_font_size (_SELF, NUM2DBL (scale));
@@ -1048,7 +1048,7 @@
   cairo_font_options_t *options = cairo_font_options_create ();
   rb_cairo_check_status (cairo_font_options_status (options));
   cairo_get_font_options (_SELF, options);
-  cr_check_status (_SELF);
+  rb_cairo_check_status (cairo_font_options_status (options));
   return CRFONTOPTIONS2RVAL (options);
 }
 
@@ -1071,7 +1071,7 @@
 static VALUE
 cr_show_text (VALUE self, VALUE utf8)
 {
-  cairo_show_text (_SELF, StringValuePtr (utf8));
+  cairo_show_text (_SELF, RVAL2CSTR (utf8));
   cr_check_status (_SELF);
   return self;
 }

Index: rb_cairo_font_extents.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_font_extents.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_font_extents.c	6 Mar 2007 12:17:34 -0000	1.1
+++ rb_cairo_font_extents.c	1 May 2007 12:03:21 -0000	1.2
@@ -98,7 +98,7 @@
   rb_str_cat2 (ret, "max_y_advance=");
   rb_str_concat (ret, rb_inspect (cr_font_extents_max_y_advance (self)));
   rb_str_cat2 (ret, ">");
-                 
+
   return ret;
 }
 

Index: rb_cairo_glyph.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_glyph.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_glyph.c	6 Mar 2007 12:17:34 -0000	1.1
+++ rb_cairo_glyph.c	1 May 2007 12:03:21 -0000	1.2
@@ -131,7 +131,7 @@
   rb_str_cat2 (ret, "y=");
   rb_str_concat (ret, rb_inspect (cr_glyph_y (self)));
   rb_str_cat2 (ret, ">");
-                 
+
   return ret;
 }
 

Index: rb_cairo_pattern.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_pattern.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rb_cairo_pattern.c	16 Apr 2007 07:31:43 -0000	1.3
+++ rb_cairo_pattern.c	1 May 2007 12:03:21 -0000	1.4
@@ -172,6 +172,7 @@
                 "(color_hex_triplet), "
                 "(Cairo::Color::RGB), "
                 "(Cairo::Color::CMYK), "
+                "(Cairo::Color::HSV), "
                 "(red, green, blue), "
                 "([red, green, blue]), "
                 "(red, green, blue, alpha) or "