[cairo-commit] rcairo/src cairo.def, 1.3, 1.4 rb_cairo_constants.c, 1.4, 1.5 rb_cairo_pattern.c, 1.8, 1.9 rb_cairo_scaled_font.c, 1.3, 1.4 rb_cairo_surface.c, 1.9, 1.10
Kouhei Sutou
commit at pdx.freedesktop.org
Sun May 20 02:19:00 PDT 2007
Committed by: kou
Update of /cvs/cairo/rcairo/src
In directory kemper:/tmp/cvs-serv17334/src
Modified Files:
cairo.def rb_cairo_constants.c rb_cairo_pattern.c
rb_cairo_scaled_font.c rb_cairo_surface.c
Log Message:
* src/cairo.def, src/rb_cairo_pattern.c, src/rb_cairo_surface.c,
src/rb_cairo_font_face.c: removed needless methods XXX#type.
Index: cairo.def
===================================================================
RCS file: /cvs/cairo/rcairo/src/cairo.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo.def 20 May 2007 02:45:40 -0000 1.3
+++ cairo.def 20 May 2007 09:18:49 -0000 1.4
@@ -33,12 +33,9 @@
rb_mCairo_SubpixelOrder DATA
rb_mCairo_HintStyle DATA
rb_mCairo_HintMetrics DATA
- rb_mCairo_FontType DATA
rb_mCairo_PathDataType DATA
rb_mCairo_Content DATA
- rb_mCairo_SurfaceType DATA
rb_mCairo_Format DATA
- rb_mCairo_PatternType DATA
rb_mCairo_Extend DATA
rb_mCairo_Filter DATA
rb_mCairo_SVGVersion DATA
Index: rb_cairo_constants.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_constants.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rb_cairo_constants.c 20 May 2007 02:45:40 -0000 1.4
+++ rb_cairo_constants.c 20 May 2007 09:18:49 -0000 1.5
@@ -26,12 +26,9 @@
VALUE rb_mCairo_SubpixelOrder;
VALUE rb_mCairo_HintStyle;
VALUE rb_mCairo_HintMetrics;
-VALUE rb_mCairo_FontType;
VALUE rb_mCairo_PathDataType;
VALUE rb_mCairo_Content;
-VALUE rb_mCairo_SurfaceType;
VALUE rb_mCairo_Format;
-VALUE rb_mCairo_PatternType;
VALUE rb_mCairo_Extend;
VALUE rb_mCairo_Filter;
VALUE rb_mCairo_SVGVersion;
@@ -261,18 +258,6 @@
INT2FIX (CAIRO_HINT_METRICS_OFF));
- /* cairo_font_type_t */
- rb_mCairo_FontType = rb_define_module_under (rb_mCairo, "FontType");
- rb_define_const (rb_mCairo_FontType, "TOY",
- INT2FIX (CAIRO_FONT_TYPE_TOY));
- rb_define_const (rb_mCairo_FontType, "FT",
- INT2FIX (CAIRO_FONT_TYPE_FT));
- rb_define_const (rb_mCairo_FontType, "WIN32",
- INT2FIX (CAIRO_FONT_TYPE_WIN32));
- rb_define_const (rb_mCairo_FontType, "ATSUI",
- INT2FIX (CAIRO_FONT_TYPE_ATSUI));
-
-
/* cairo_path_data_type_t */
rb_mCairo_PathDataType = rb_define_module_under (rb_mCairo, "PathDataType");
rb_define_const (rb_mCairo_PathDataType, "MOVE_TO",
@@ -295,35 +280,6 @@
INT2FIX (CAIRO_CONTENT_COLOR_ALPHA));
- /* cairo_surface_type_t */
- rb_mCairo_SurfaceType = rb_define_module_under (rb_mCairo, "SurfaceType");
- rb_define_const (rb_mCairo_SurfaceType, "IMAGE",
- INT2FIX (CAIRO_SURFACE_TYPE_IMAGE));
- rb_define_const (rb_mCairo_SurfaceType, "PDF",
- INT2FIX (CAIRO_SURFACE_TYPE_PDF));
- rb_define_const (rb_mCairo_SurfaceType, "PS",
- INT2FIX (CAIRO_SURFACE_TYPE_PS));
- rb_define_const (rb_mCairo_SurfaceType, "XLIB",
- INT2FIX (CAIRO_SURFACE_TYPE_XLIB));
- rb_define_const (rb_mCairo_SurfaceType, "XCB",
- INT2FIX (CAIRO_SURFACE_TYPE_XCB));
- rb_define_const (rb_mCairo_SurfaceType, "GLITZ",
- INT2FIX (CAIRO_SURFACE_TYPE_GLITZ));
- rb_define_const (rb_mCairo_SurfaceType, "QUARTZ",
- INT2FIX (CAIRO_SURFACE_TYPE_QUARTZ));
- rb_define_const (rb_mCairo_SurfaceType, "WIN32",
- INT2FIX (CAIRO_SURFACE_TYPE_WIN32));
- rb_define_const (rb_mCairo_SurfaceType, "BEOS",
- INT2FIX (CAIRO_SURFACE_TYPE_BEOS));
- rb_define_const (rb_mCairo_SurfaceType, "DIRECTFB",
- INT2FIX (CAIRO_SURFACE_TYPE_DIRECTFB));
- rb_define_const (rb_mCairo_SurfaceType, "SVG",
- INT2FIX (CAIRO_SURFACE_TYPE_SVG));
-#if CAIRO_CHECK_VERSION(1, 3, 0)
- rb_define_const (rb_mCairo_SurfaceType, "OS2",
- INT2FIX (CAIRO_SURFACE_TYPE_OS2));
-#endif
-
/* cairo_format_t */
rb_mCairo_Format = rb_define_module_under (rb_mCairo, "Format");
rb_define_const (rb_mCairo_Format, "ARGB32",
@@ -340,17 +296,6 @@
#endif
- /* cairo_pattern_type_t */
- rb_mCairo_PatternType = rb_define_module_under (rb_mCairo, "PatternType");
- rb_define_const (rb_mCairo_PatternType, "SOLID",
- INT2FIX (CAIRO_PATTERN_TYPE_SOLID));
- rb_define_const (rb_mCairo_PatternType, "SURFACE",
- INT2FIX (CAIRO_PATTERN_TYPE_SURFACE));
- rb_define_const (rb_mCairo_PatternType, "LINEAR",
- INT2FIX (CAIRO_PATTERN_TYPE_LINEAR));
- rb_define_const (rb_mCairo_PatternType, "RADIAL",
- INT2FIX (CAIRO_PATTERN_TYPE_RADIAL));
-
/* cairo_extend_t */
rb_mCairo_Extend = rb_define_module_under (rb_mCairo, "Extend");
rb_define_const (rb_mCairo_Extend, "NONE",
Index: rb_cairo_pattern.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_pattern.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rb_cairo_pattern.c 20 May 2007 08:46:07 -0000 1.8
+++ rb_cairo_pattern.c 20 May 2007 09:18:49 -0000 1.9
@@ -119,12 +119,6 @@
}
static VALUE
-cr_pattern_get_type (VALUE self)
-{
- return INT2NUM (cairo_pattern_get_type (_SELF (self)));
-}
-
-static VALUE
cr_solid_pattern_initialize (int argc, VALUE *argv, VALUE self)
{
VALUE red, green, blue, alpha;
@@ -455,7 +449,6 @@
rb_define_alloc_func (rb_cCairo_Pattern, cr_pattern_allocate);
rb_define_method (rb_cCairo_Pattern, "initialize", cr_pattern_initialize, 0);
- rb_define_method (rb_cCairo_Pattern, "type", cr_pattern_get_type, 0);
rb_define_method (rb_cCairo_Pattern, "set_matrix", cr_pattern_set_matrix, 1);
rb_define_method (rb_cCairo_Pattern, "matrix", cr_pattern_get_matrix, 0);
Index: rb_cairo_scaled_font.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_scaled_font.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rb_cairo_scaled_font.c 18 May 2007 14:07:48 -0000 1.3
+++ rb_cairo_scaled_font.c 20 May 2007 09:18:49 -0000 1.4
@@ -83,12 +83,6 @@
}
static VALUE
-cr_scaled_font_get_type (VALUE self)
-{
- return INT2NUM (cairo_scaled_font_get_type ( _SELF (self)));
-}
-
-static VALUE
cr_scaled_font_extents (VALUE self)
{
cairo_font_extents_t extents;
@@ -168,7 +162,6 @@
rb_define_method (rb_cCairo_ScaledFont, "initialize",
cr_scaled_font_initialize, 4);
- rb_define_method (rb_cCairo_ScaledFont, "type", cr_scaled_font_get_type, 0);
rb_define_method (rb_cCairo_ScaledFont, "extents", cr_scaled_font_extents, 0);
rb_define_method (rb_cCairo_ScaledFont, "text_extents",
cr_scaled_font_text_extents, 1);
Index: rb_cairo_surface.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_surface.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rb_cairo_surface.c 20 May 2007 08:46:07 -0000 1.9
+++ rb_cairo_surface.c 20 May 2007 09:18:49 -0000 1.10
@@ -302,12 +302,6 @@
}
static VALUE
-cr_surface_get_type (VALUE self)
-{
- return INT2NUM (cairo_surface_get_type (_SELF));
-}
-
-static VALUE
cr_surface_get_content (VALUE self)
{
return INT2NUM (cairo_surface_get_content (_SELF));
@@ -842,7 +836,6 @@
rb_define_method (rb_cCairo_Surface, "create_similar",
cr_surface_create_similar, 3);
rb_define_method (rb_cCairo_Surface, "finish", cr_surface_finish, 0);
- rb_define_method (rb_cCairo_Surface, "type", cr_surface_get_type, 0);
rb_define_method (rb_cCairo_Surface, "content", cr_surface_get_content, 0);
rb_define_method (rb_cCairo_Surface, "font_options",
More information about the cairo-commit
mailing list