[cairo-commit] cairo/test get-and-set.c,1.4,1.5

[Christian Biesinger]

Committed by: biesi

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv24659/test

Modified Files:
	get-and-set.c 
Log Message:
2005-12-16  Christian Biesinger  <cbiesinger at web.de>

	reviewed by: cworth

	* CODING_STYLE:
	* src/cairo-atsui-font.c: (_cairo_atsui_font_old_show_glyphs):
	* src/cairo-clip-private.h:
	* src/cairo-clip.c: (_cairo_clip_combine_to_surface):
	* src/cairo-ft-font.c: (_cairo_ft_show_glyphs):
	* src/cairo-gstate-private.h:
	* src/cairo-gstate.c: (_cairo_gstate_init),
	(_cairo_gstate_init_copy), (_cairo_gstate_set_operator),
	(_cairo_gstate_get_operator), (_cairo_gstate_paint),
	(_cairo_operator_bounded_by_mask),
	(_cairo_operator_bounded_by_source),
	(_cairo_gstate_clip_and_composite_with_mask),
	(_cairo_gstate_clip_and_composite_combine),
	(_cairo_gstate_clip_and_composite), (_cairo_gstate_mask),
	(_cairo_gstate_stroke), (_composite_trap_region),
	(_composite_traps_draw_func),
	(_cairo_surface_clip_and_composite_trapezoids),
	(_cairo_gstate_fill), (_cairo_gstate_show_glyphs):
	* src/cairo-image-surface.c: (_pixman_operator),
	(_cairo_image_surface_composite),
	(_cairo_image_surface_fill_rectangles),
	(_cairo_image_surface_composite_trapezoids):
	* src/cairo-meta-surface-private.h:
	* src/cairo-meta-surface.c: (_cairo_meta_surface_paint),
	(_cairo_meta_surface_mask), (_cairo_meta_surface_stroke),
	(_cairo_meta_surface_fill), (_cairo_meta_surface_show_glyphs),
	(_cairo_meta_surface_replay):
	* src/cairo-pdf-surface.c: (_cairo_pdf_surface_composite),
	(_cairo_pdf_surface_fill_rectangles), (_cairo_pdf_surface_fill),
	(_cairo_pdf_surface_composite_trapezoids),
	(_cairo_pdf_surface_old_show_glyphs):
	* src/cairo-ps-surface.c: (_cairo_ps_surface_composite),
	(_cairo_ps_surface_fill_rectangles),
	(_cairo_ps_surface_composite_trapezoids),
	(_cairo_ps_surface_old_show_glyphs), (_cairo_ps_surface_paint),
	(_cairo_ps_surface_mask), (_cairo_ps_surface_stroke),
	(_cairo_ps_surface_fill), (_cairo_ps_surface_show_glyphs),
	(operator_always_opaque), (operator_always_translucent),
	(color_operation_needs_fallback),
	(pattern_operation_needs_fallback), (_ps_output_composite),
	(_ps_output_fill_rectangles), (_ps_output_composite_trapezoids),
	(_ps_output_old_show_glyphs), (_ps_output_paint),
	(_ps_output_mask), (_ps_output_stroke), (_ps_output_fill),
	(_ps_output_show_glyphs):
	* src/cairo-scaled-font.c: (_cairo_scaled_font_show_glyphs):
	* src/cairo-surface.c: (_fallback_composite),
	(_cairo_surface_composite), (_cairo_surface_fill_rectangle),
	(_cairo_surface_fill_region), (_fallback_fill_rectangles),
	(_cairo_surface_fill_rectangles), (_fallback_paint),
	(_cairo_surface_paint), (_cairo_surface_mask_draw_func),
	(_fallback_mask), (_cairo_surface_mask), (_fallback_stroke),
	(_cairo_surface_stroke), (_fallback_fill), (_cairo_surface_fill),
	(_fallback_composite_trapezoids),
	(_cairo_surface_composite_trapezoids),
	(_cairo_surface_old_show_glyphs_draw_func),
	(_fallback_show_glyphs), (_cairo_surface_show_glyphs),
	(_cairo_surface_old_show_glyphs):
	* src/cairo-svg-surface.c: (_cairo_svg_surface_composite),
	(emit_operator), (_cairo_svg_surface_fill),
	(_cairo_svg_surface_composite_trapezoids),
	(_cairo_svg_surface_stroke), (_cairo_svg_surface_old_show_glyphs):
	* src/cairo-win32-font.c: (_cairo_win32_scaled_font_show_glyphs):
	* src/cairo-win32-surface.c: (_cairo_win32_surface_composite),
	(categorize_solid_dest_operator),
	(_cairo_win32_surface_fill_rectangles):
	* src/cairo-xcb-surface.c: (_render_operator),
	(_cairo_xcb_surface_composite),
	(_cairo_xcb_surface_fill_rectangles),
	(_cairo_xcb_surface_composite_trapezoids):
	* src/cairo-xlib-surface.c: (_operator_needs_alpha_composite),
	(_categorize_composite_operation),
	(_recategorize_composite_operation), (_render_operator),
	(_cairo_xlib_surface_composite),
	(_cairo_xlib_surface_fill_rectangles),
	(_cairo_xlib_surface_composite_trapezoids),
	(_cairo_xlib_surface_old_show_glyphs8),
	(_cairo_xlib_surface_old_show_glyphs16),
	(_cairo_xlib_surface_old_show_glyphs32),
	(_cairo_xlib_surface_old_show_glyphs):
	* src/cairoint.h:
	* test/get-and-set.c: (settings_set), (settings_get),
	(settings_equal): Globally rename "operator" to "op", to allow
	writing backends in C++




Index: get-and-set.c
===================================================================
RCS file: /cvs/cairo/cairo/test/get-and-set.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- get-and-set.c	31 Aug 2005 20:33:42 -0000	1.4
+++ get-and-set.c	16 Dec 2005 11:02:35 -0000	1.5
@@ -32,7 +32,7 @@
 };
 
 typedef struct {
-    cairo_operator_t operator;
+    cairo_operator_t op;
     double tolerance;
     cairo_fill_rule_t fill_rule;
     double line_width;
@@ -69,7 +69,7 @@
 static void
 settings_set (cairo_t *cr, settings_t *settings)
 {
-    cairo_set_operator (cr, settings->operator);
+    cairo_set_operator (cr, settings->op);
     cairo_set_tolerance (cr, settings->tolerance);
     cairo_set_fill_rule (cr, settings->fill_rule);
     cairo_set_line_width (cr, settings->line_width);
@@ -82,7 +82,7 @@
 static void
 settings_get (cairo_t *cr, settings_t *settings)
 {
-    settings->operator = cairo_get_operator (cr);
+    settings->op = cairo_get_operator (cr);
     settings->tolerance = cairo_get_tolerance (cr);
     settings->fill_rule = cairo_get_fill_rule (cr);
     settings->line_width = cairo_get_line_width (cr);
@@ -95,7 +95,7 @@
 static int
 settings_equal (settings_t *a, settings_t *b)
 {
-    return (a->operator == b->operator &&
+    return (a->op == b->op &&
 	    a->tolerance == b->tolerance &&
 	    a->fill_rule == b->fill_rule &&
 	    a->line_width == b->line_width &&