[cairo-commit] cairo/src cairo-atsui-font.c, 1.25,
1.26 cairo-clip-private.h, 1.3, 1.4 cairo-clip.c, 1.7,
1.8 cairo-ft-font.c, 1.113, 1.114 cairo-gstate-private.h, 1.19,
1.20 cairo-gstate.c, 1.187, 1.188 cairo-image-surface.c, 1.65,
1.66 cairo-meta-surface-private.h, 1.9,
1.10 cairo-meta-surface.c, 1.19, 1.20 cairo-pdf-surface.c,
1.68, 1.69 cairo-ps-surface.c, 1.63, 1.64 cairo-scaled-font.c,
1.8, 1.9 cairo-surface.c, 1.113, 1.114 cairo-svg-surface.c,
1.1, 1.2 cairo-win32-font.c, 1.44, 1.45 cairo-win32-surface.c,
1.38, 1.39 cairo-xcb-surface.c, 1.52,
1.53 cairo-xlib-surface.c, 1.127, 1.128 cairoint.h, 1.231, 1.232
Christian Biesinger
commit at pdx.freedesktop.org
Fri Dec 16 03:02:38 PST 2005
Committed by: biesi
Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv24659/src
Modified Files:
cairo-atsui-font.c cairo-clip-private.h cairo-clip.c
cairo-ft-font.c cairo-gstate-private.h cairo-gstate.c
cairo-image-surface.c cairo-meta-surface-private.h
cairo-meta-surface.c cairo-pdf-surface.c cairo-ps-surface.c
cairo-scaled-font.c cairo-surface.c cairo-svg-surface.c
cairo-win32-font.c cairo-win32-surface.c cairo-xcb-surface.c
cairo-xlib-surface.c cairoint.h
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: cairo-atsui-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-atsui-font.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cairo-atsui-font.c 2 Nov 2005 00:40:37 -0000 1.25
+++ cairo-atsui-font.c 16 Dec 2005 11:02:35 -0000 1.26
@@ -542,7 +542,7 @@
static cairo_int_status_t
_cairo_atsui_font_old_show_glyphs (void *abstract_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *generic_surface,
int source_x,
Index: cairo-clip-private.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-clip-private.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo-clip-private.h 9 Aug 2005 01:35:22 -0000 1.3
+++ cairo-clip-private.h 16 Dec 2005 11:02:35 -0000 1.4
@@ -114,7 +114,7 @@
cairo_private cairo_status_t
_cairo_clip_combine_to_surface (cairo_clip_t *clip,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_surface_t *dst,
int dst_x,
int dst_y,
Index: cairo-clip.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-clip.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cairo-clip.c 7 Nov 2005 18:48:01 -0000 1.7
+++ cairo-clip.c 16 Dec 2005 11:02:35 -0000 1.8
@@ -196,7 +196,7 @@
*/
cairo_status_t
_cairo_clip_combine_to_surface (cairo_clip_t *clip,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_surface_t *dst,
int dst_x,
int dst_y,
@@ -207,7 +207,7 @@
_cairo_pattern_init_for_surface (&pattern.surface, clip->surface);
- status = _cairo_surface_composite (operator,
+ status = _cairo_surface_composite (op,
&pattern.base,
NULL,
dst,
Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- cairo-ft-font.c 2 Sep 2005 03:38:07 -0000 1.113
+++ cairo-ft-font.c 16 Dec 2005 11:02:35 -0000 1.114
@@ -1890,7 +1890,7 @@
static cairo_int_status_t
_cairo_ft_show_glyphs (void *abstract_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *surface,
int source_x,
Index: cairo-gstate-private.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate-private.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cairo-gstate-private.h 4 Nov 2005 19:16:39 -0000 1.19
+++ cairo-gstate-private.h 16 Dec 2005 11:02:35 -0000 1.20
@@ -39,7 +39,7 @@
#include "cairo-clip-private.h"
struct _cairo_gstate {
- cairo_operator_t operator;
+ cairo_operator_t op;
double tolerance;
cairo_antialias_t antialias;
Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- cairo-gstate.c 21 Nov 2005 18:50:20 -0000 1.187
+++ cairo-gstate.c 16 Dec 2005 11:02:35 -0000 1.188
@@ -98,7 +98,7 @@
_cairo_gstate_init (cairo_gstate_t *gstate,
cairo_surface_t *target)
{
- gstate->operator = CAIRO_GSTATE_OPERATOR_DEFAULT;
+ gstate->op = CAIRO_GSTATE_OPERATOR_DEFAULT;
gstate->tolerance = CAIRO_GSTATE_TOLERANCE_DEFAULT;
gstate->antialias = CAIRO_ANTIALIAS_DEFAULT;
@@ -144,7 +144,7 @@
{
cairo_status_t status;
- gstate->operator = other->operator;
+ gstate->op = other->op;
gstate->tolerance = other->tolerance;
gstate->antialias = other->antialias;
@@ -300,7 +300,7 @@
* XXX: This could be made much more efficient by using
_cairo_surface_get_damaged_width/Height if cairo_surface_t actually kept
track of such informaton. *
- _cairo_surface_composite (gstate->operator,
+ _cairo_surface_composite (gstate->op,
gstate->target,
mask,
gstate->parent_surface,
@@ -354,9 +354,9 @@
}
cairo_status_t
-_cairo_gstate_set_operator (cairo_gstate_t *gstate, cairo_operator_t operator)
+_cairo_gstate_set_operator (cairo_gstate_t *gstate, cairo_operator_t op)
{
- gstate->operator = operator;
+ gstate->op = op;
return CAIRO_STATUS_SUCCESS;
}
@@ -364,7 +364,7 @@
cairo_operator_t
_cairo_gstate_get_operator (cairo_gstate_t *gstate)
{
- return gstate->operator;
+ return gstate->op;
}
cairo_status_t
@@ -751,7 +751,7 @@
_cairo_gstate_copy_transformed_source (gstate, &pattern.base);
status = _cairo_surface_paint (gstate->target,
- gstate->operator,
+ gstate->op,
&pattern.base);
_cairo_pattern_fini (&pattern.base);
@@ -761,7 +761,7 @@
/**
* _cairo_operator_bounded_by_mask:
- * @operator: a #cairo_operator_t
+ * @op: a #cairo_operator_t
*
* A bounded operator is one where mask pixel
* of zero results in no effect on the destination image.
@@ -773,9 +773,9 @@
* Return value: %TRUE if the operator is bounded by the mask operand
**/
cairo_bool_t
-_cairo_operator_bounded_by_mask (cairo_operator_t operator)
+_cairo_operator_bounded_by_mask (cairo_operator_t op)
{
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_CLEAR:
case CAIRO_OPERATOR_SOURCE:
case CAIRO_OPERATOR_OVER:
@@ -800,7 +800,7 @@
/**
* _cairo_operator_bounded_by_source:
- * @operator: a #cairo_operator_t
+ * @op: a #cairo_operator_t
*
* A bounded operator is one where source pixels of zero
* (in all four components, r, g, b and a) effect no change
@@ -813,9 +813,9 @@
* Return value: %TRUE if the operator is bounded by the source operand
**/
cairo_bool_t
-_cairo_operator_bounded_by_source (cairo_operator_t operator)
+_cairo_operator_bounded_by_source (cairo_operator_t op)
{
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_OVER:
case CAIRO_OPERATOR_ATOP:
case CAIRO_OPERATOR_DEST:
@@ -884,7 +884,7 @@
*/
static cairo_status_t
_cairo_gstate_clip_and_composite_with_mask (cairo_clip_t *clip,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_draw_func_t draw_func,
void *draw_closure,
@@ -901,7 +901,7 @@
if (status)
return status;
- status = _cairo_surface_composite (operator,
+ status = _cairo_surface_composite (op,
src, &mask_pattern.base, dst,
extents->x, extents->y,
0, 0,
@@ -918,7 +918,7 @@
*/
static cairo_status_t
_cairo_gstate_clip_and_composite_combine (cairo_clip_t *clip,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_draw_func_t draw_func,
void *draw_closure,
@@ -958,7 +958,7 @@
if (status)
goto CLEANUP_SURFACE;
- status = (*draw_func) (draw_closure, operator,
+ status = (*draw_func) (draw_closure, op,
src, intermediate,
extents->x, extents->y,
extents);
@@ -1060,7 +1060,7 @@
/**
* _cairo_gstate_clip_and_composite:
* @gstate: a #cairo_gstate_t
- * @operator: the operator to draw with
+ * @op: the operator to draw with
* @src: source pattern
* @draw_func: function that can be called to draw with the mask onto a surface.
* @draw_closure: data to pass to @draw_func.
@@ -1080,7 +1080,7 @@
**/
cairo_status_t
_cairo_gstate_clip_and_composite (cairo_clip_t *clip,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_draw_func_t draw_func,
void *draw_closure,
@@ -1094,33 +1094,33 @@
/* Nothing to do */
return CAIRO_STATUS_SUCCESS;
- if (operator == CAIRO_OPERATOR_CLEAR) {
+ if (op == CAIRO_OPERATOR_CLEAR) {
_cairo_pattern_init_solid (&solid_pattern.solid, CAIRO_COLOR_WHITE);
src = &solid_pattern.base;
- operator = CAIRO_OPERATOR_DEST_OUT;
+ op = CAIRO_OPERATOR_DEST_OUT;
}
- if (clip->surface || operator == CAIRO_OPERATOR_SOURCE)
+ if (clip->surface || op == CAIRO_OPERATOR_SOURCE)
{
- if (operator == CAIRO_OPERATOR_SOURCE)
+ if (op == CAIRO_OPERATOR_SOURCE)
status = _cairo_gstate_clip_and_composite_source (clip,
src,
draw_func, draw_closure,
dst, extents);
- else if (_cairo_operator_bounded_by_mask (operator))
- status = _cairo_gstate_clip_and_composite_with_mask (clip, operator,
+ else if (_cairo_operator_bounded_by_mask (op))
+ status = _cairo_gstate_clip_and_composite_with_mask (clip, op,
src,
draw_func, draw_closure,
dst, extents);
else
- status = _cairo_gstate_clip_and_composite_combine (clip, operator,
+ status = _cairo_gstate_clip_and_composite_combine (clip, op,
src,
draw_func, draw_closure,
dst, extents);
}
else
{
- status = (*draw_func) (draw_closure, operator,
+ status = (*draw_func) (draw_closure, op,
src, dst,
0, 0,
extents);
@@ -1153,7 +1153,7 @@
_cairo_gstate_copy_transformed_mask (gstate, &mask_pattern.base, mask);
status = _cairo_surface_mask (gstate->target,
- gstate->operator,
+ gstate->op,
&source_pattern.base,
&mask_pattern.base);
@@ -1182,7 +1182,7 @@
_cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
status = _cairo_surface_stroke (gstate->target,
- gstate->operator,
+ gstate->op,
&source_pattern.base,
path,
&gstate->stroke_style,
@@ -1279,7 +1279,7 @@
static cairo_status_t
_composite_trap_region (cairo_clip_t *clip,
cairo_pattern_t *src,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_surface_t *dst,
pixman_region16_t *trap_region,
cairo_rectangle_t *extents)
@@ -1290,10 +1290,10 @@
int num_rects = pixman_region_num_rects (trap_region);
unsigned int clip_serial;
- if (clip->surface && operator == CAIRO_OPERATOR_CLEAR) {
+ if (clip->surface && op == CAIRO_OPERATOR_CLEAR) {
_cairo_pattern_init_solid (&solid_pattern.solid, CAIRO_COLOR_WHITE);
src = &solid_pattern.base;
- operator = CAIRO_OPERATOR_DEST_OUT;
+ op = CAIRO_OPERATOR_DEST_OUT;
}
if (num_rects == 0)
@@ -1314,7 +1314,7 @@
if (clip->surface)
_cairo_pattern_init_for_surface (&mask.surface, clip->surface);
- status = _cairo_surface_composite (operator,
+ status = _cairo_surface_composite (op,
src,
clip->surface ? &mask.base : NULL,
dst,
@@ -1340,7 +1340,7 @@
static cairo_status_t
_composite_traps_draw_func (void *closure,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_surface_t *dst,
int dst_x,
@@ -1358,7 +1358,7 @@
if (!src)
src = &pattern.base;
- status = _cairo_surface_composite_trapezoids (operator,
+ status = _cairo_surface_composite_trapezoids (op,
src, dst, info->antialias,
extents->x, extents->y,
extents->x - dst_x, extents->y - dst_y,
@@ -1373,7 +1373,7 @@
/* Warning: This call modifies the coordinates of traps */
cairo_status_t
_cairo_surface_clip_and_composite_trapezoids (cairo_pattern_t *src,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_surface_t *dst,
cairo_traps_t *traps,
cairo_clip_t *clip,
@@ -1392,7 +1392,7 @@
if (status)
return status;
- if (_cairo_operator_bounded_by_mask (operator))
+ if (_cairo_operator_bounded_by_mask (op))
{
if (trap_region) {
status = _cairo_clip_intersect_to_region (clip, trap_region);
@@ -1445,18 +1445,18 @@
if (trap_region)
{
- if ((src->type == CAIRO_PATTERN_SOLID || operator == CAIRO_OPERATOR_CLEAR) &&
+ if ((src->type == CAIRO_PATTERN_SOLID || op == CAIRO_OPERATOR_CLEAR) &&
!clip->surface)
{
const cairo_color_t *color;
- if (operator == CAIRO_OPERATOR_CLEAR)
+ if (op == CAIRO_OPERATOR_CLEAR)
color = CAIRO_COLOR_TRANSPARENT;
else
color = &((cairo_solid_pattern_t *)src)->color;
/* Solid rectangles special case */
- status = _cairo_surface_fill_region (dst, operator, color, trap_region);
+ status = _cairo_surface_fill_region (dst, op, color, trap_region);
if (!status && clear_region)
status = _cairo_surface_fill_region (dst, CAIRO_OPERATOR_CLEAR,
CAIRO_COLOR_TRANSPARENT,
@@ -1465,7 +1465,7 @@
goto out;
}
- if ((_cairo_operator_bounded_by_mask (operator) && operator != CAIRO_OPERATOR_SOURCE) ||
+ if ((_cairo_operator_bounded_by_mask (op) && op != CAIRO_OPERATOR_SOURCE) ||
!clip->surface)
{
/* For a simple rectangle, we can just use composite(), for more
@@ -1483,7 +1483,7 @@
* more than rectangle and the destination doesn't support clip
* regions. In that case, we fall through.
*/
- status = _composite_trap_region (clip, src, operator, dst,
+ status = _composite_trap_region (clip, src, op, dst,
trap_region, &extents);
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
{
@@ -1499,7 +1499,7 @@
traps_info.traps = traps;
traps_info.antialias = antialias;
- status = _cairo_gstate_clip_and_composite (clip, operator, src,
+ status = _cairo_gstate_clip_and_composite (clip, op, src,
_composite_traps_draw_func, &traps_info,
dst, &extents);
@@ -1528,7 +1528,7 @@
_cairo_gstate_copy_transformed_source (gstate, &pattern.base);
status = _cairo_surface_fill (gstate->target,
- gstate->operator,
+ gstate->op,
&pattern.base,
path,
gstate->fill_rule,
@@ -1985,7 +1985,7 @@
_cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
status = _cairo_surface_show_glyphs (gstate->target,
- gstate->operator,
+ gstate->op,
&source_pattern.base,
transformed_glyphs,
num_glyphs,
Index: cairo-image-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-image-surface.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- cairo-image-surface.c 2 Nov 2005 00:40:37 -0000 1.65
+++ cairo-image-surface.c 16 Dec 2005 11:02:35 -0000 1.66
@@ -516,9 +516,9 @@
* things in pixman I think).
*/
static pixman_operator_t
-_pixman_operator (cairo_operator_t operator)
+_pixman_operator (cairo_operator_t op)
{
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_CLEAR:
return PIXMAN_OPERATOR_CLEAR;
@@ -556,7 +556,7 @@
}
static cairo_int_status_t
-_cairo_image_surface_composite (cairo_operator_t operator,
+_cairo_image_surface_composite (cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -596,7 +596,7 @@
if (status)
goto CLEANUP_SURFACES;
- pixman_composite (_pixman_operator (operator),
+ pixman_composite (_pixman_operator (op),
src->pixman_image,
mask->pixman_image,
dst->pixman_image,
@@ -609,7 +609,7 @@
}
else
{
- pixman_composite (_pixman_operator (operator),
+ pixman_composite (_pixman_operator (op),
src->pixman_image,
NULL,
dst->pixman_image,
@@ -620,7 +620,7 @@
width, height);
}
- if (!_cairo_operator_bounded_by_source (operator))
+ if (!_cairo_operator_bounded_by_source (op))
status = _cairo_surface_composite_fixup_unbounded (&dst->base,
&src_attr, src->width, src->height,
mask ? &mask_attr : NULL,
@@ -641,7 +641,7 @@
static cairo_int_status_t
_cairo_image_surface_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -656,7 +656,7 @@
pixman_color.alpha = color->alpha_short;
/* XXX: The pixman_rectangle_t cast is evil... it needs to go away somehow. */
- pixman_fill_rectangles (_pixman_operator(operator), surface->pixman_image,
+ pixman_fill_rectangles (_pixman_operator(op), surface->pixman_image,
&pixman_color, (pixman_rectangle_t *) rects, num_rects);
return CAIRO_STATUS_SUCCESS;
@@ -677,7 +677,7 @@
}
static cairo_int_status_t
-_cairo_image_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_image_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_dst,
cairo_antialias_t antialias,
@@ -713,7 +713,7 @@
* falling through to the general case when the surface is clipped
* since libpixman would have to generate an intermediate mask anyways.
*/
- if (operator == CAIRO_OPERATOR_ADD &&
+ if (op == CAIRO_OPERATOR_ADD &&
_cairo_pattern_is_opaque_solid (pattern) &&
_cairo_image_surface_is_alpha_only (dst) &&
!dst->has_clip &&
@@ -773,7 +773,7 @@
pixman_add_trapezoids (mask, - dst_x, - dst_y,
(pixman_trapezoid_t *) traps, num_traps);
- pixman_composite (_pixman_operator (operator),
+ pixman_composite (_pixman_operator (op),
src->pixman_image,
mask,
dst->pixman_image,
@@ -783,7 +783,7 @@
dst_x, dst_y,
width, height);
- if (!_cairo_operator_bounded_by_mask (operator))
+ if (!_cairo_operator_bounded_by_mask (op))
status = _cairo_surface_composite_shape_fixup_unbounded (&dst->base,
&attributes, src->width, src->height,
width, height,
Index: cairo-meta-surface-private.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-meta-surface-private.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cairo-meta-surface-private.h 15 Dec 2005 00:45:39 -0000 1.9
+++ cairo-meta-surface-private.h 16 Dec 2005 11:02:35 -0000 1.10
@@ -59,20 +59,20 @@
typedef struct _cairo_command_paint {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_pattern_union_t source;
} cairo_command_paint_t;
typedef struct _cairo_command_mask {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_pattern_union_t source;
cairo_pattern_union_t mask;
} cairo_command_mask_t;
typedef struct _cairo_command_stroke {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_pattern_union_t source;
cairo_path_fixed_t path;
cairo_stroke_style_t style;
@@ -84,7 +84,7 @@
typedef struct _cairo_command_fill {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_pattern_union_t source;
cairo_path_fixed_t path;
cairo_fill_rule_t fill_rule;
@@ -94,7 +94,7 @@
typedef struct _cairo_command_show_glyphs {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_pattern_union_t source;
cairo_glyph_t *glyphs;
int num_glyphs;
@@ -103,7 +103,7 @@
typedef struct _cairo_command_composite {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_pattern_union_t src_pattern;
cairo_pattern_union_t mask_pattern;
cairo_pattern_t *mask_pattern_pointer;
@@ -119,7 +119,7 @@
typedef struct _cairo_command_fill_rectangles {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_color_t color;
cairo_rectangle_t *rects;
int num_rects;
@@ -127,7 +127,7 @@
typedef struct _cairo_command_composite_trapezoids {
cairo_command_type_t type;
- cairo_operator_t operator;
+ cairo_operator_t op;
cairo_pattern_union_t pattern;
cairo_antialias_t antialias;
int x_src;
Index: cairo-meta-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-meta-surface.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cairo-meta-surface.c 15 Dec 2005 00:45:39 -0000 1.19
+++ cairo-meta-surface.c 16 Dec 2005 11:02:35 -0000 1.20
@@ -197,7 +197,7 @@
static cairo_int_status_t
_cairo_meta_surface_paint (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source)
{
cairo_status_t status;
@@ -209,7 +209,7 @@
return CAIRO_STATUS_NO_MEMORY;
command->type = CAIRO_COMMAND_PAINT;
- command->operator = operator;
+ command->op = op;
status = _init_pattern_with_snapshot (&command->source.base, source);
if (status)
@@ -230,7 +230,7 @@
static cairo_int_status_t
_cairo_meta_surface_mask (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_pattern_t *mask)
{
@@ -243,7 +243,7 @@
return CAIRO_STATUS_NO_MEMORY;
command->type = CAIRO_COMMAND_MASK;
- command->operator = operator;
+ command->op = op;
status = _init_pattern_with_snapshot (&command->source.base, source);
if (status)
@@ -270,7 +270,7 @@
static cairo_int_status_t
_cairo_meta_surface_stroke (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *style,
@@ -288,7 +288,7 @@
return CAIRO_STATUS_NO_MEMORY;
command->type = CAIRO_COMMAND_STROKE;
- command->operator = operator;
+ command->op = op;
status = _init_pattern_with_snapshot (&command->source.base, source);
if (status)
@@ -326,7 +326,7 @@
static cairo_int_status_t
_cairo_meta_surface_fill (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -342,7 +342,7 @@
return CAIRO_STATUS_NO_MEMORY;
command->type = CAIRO_COMMAND_FILL;
- command->operator = operator;
+ command->op = op;
status = _init_pattern_with_snapshot (&command->source.base, source);
if (status)
@@ -373,7 +373,7 @@
static cairo_int_status_t
_cairo_meta_surface_show_glyphs (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
@@ -388,7 +388,7 @@
return CAIRO_STATUS_NO_MEMORY;
command->type = CAIRO_COMMAND_SHOW_GLYPHS;
- command->operator = operator;
+ command->op = op;
status = _init_pattern_with_snapshot (&command->source.base, source);
if (status)
@@ -596,7 +596,7 @@
break;
status = _cairo_surface_paint (target,
- command->paint.operator,
+ command->paint.op,
&command->paint.source.base);
break;
@@ -606,7 +606,7 @@
break;
status = _cairo_surface_mask (target,
- command->mask.operator,
+ command->mask.op,
&command->mask.source.base,
&command->mask.mask.base);
break;
@@ -617,7 +617,7 @@
break;
status = _cairo_surface_stroke (target,
- command->stroke.operator,
+ command->stroke.op,
&command->stroke.source.base,
&command->stroke.path,
&command->stroke.style,
@@ -633,7 +633,7 @@
break;
status = _cairo_surface_fill (target,
- command->fill.operator,
+ command->fill.op,
&command->fill.source.base,
&command->fill.path,
command->fill.fill_rule,
@@ -647,7 +647,7 @@
break;
status = _cairo_surface_show_glyphs (target,
- command->show_glyphs.operator,
+ command->show_glyphs.op,
&command->show_glyphs.source.base,
command->show_glyphs.glyphs,
command->show_glyphs.num_glyphs,
Index: cairo-pdf-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-pdf-surface.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- cairo-pdf-surface.c 5 Nov 2005 00:13:31 -0000 1.68
+++ cairo-pdf-surface.c 16 Dec 2005 11:02:35 -0000 1.69
@@ -713,7 +713,7 @@
}
static cairo_int_status_t
-_cairo_pdf_surface_composite (cairo_operator_t operator,
+_cairo_pdf_surface_composite (cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -743,7 +743,7 @@
static cairo_int_status_t
_cairo_pdf_surface_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -1249,7 +1249,7 @@
static cairo_int_status_t
_cairo_pdf_surface_fill (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -1301,7 +1301,7 @@
}
static cairo_int_status_t
-_cairo_pdf_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_pdf_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_dst,
cairo_antialias_t antialias,
@@ -1437,7 +1437,7 @@
static cairo_int_status_t
_cairo_pdf_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_surface,
int source_x,
Index: cairo-ps-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ps-surface.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cairo-ps-surface.c 14 Dec 2005 00:31:15 -0000 1.63
+++ cairo-ps-surface.c 16 Dec 2005 11:02:35 -0000 1.64
@@ -249,7 +249,7 @@
}
static cairo_int_status_t
-_cairo_ps_surface_composite (cairo_operator_t operator,
+_cairo_ps_surface_composite (cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -264,7 +264,7 @@
{
cairo_ps_surface_t *surface = abstract_dst;
- return _cairo_surface_composite (operator,
+ return _cairo_surface_composite (op,
src_pattern,
mask_pattern,
surface->current_page,
@@ -280,7 +280,7 @@
static cairo_int_status_t
_cairo_ps_surface_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -288,14 +288,14 @@
cairo_ps_surface_t *surface = abstract_surface;
return _cairo_surface_fill_rectangles (surface->current_page,
- operator,
+ op,
color,
rects,
num_rects);
}
static cairo_int_status_t
-_cairo_ps_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_ps_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_dst,
cairo_antialias_t antialias,
@@ -310,7 +310,7 @@
{
cairo_ps_surface_t *surface = abstract_dst;
- return _cairo_surface_composite_trapezoids (operator,
+ return _cairo_surface_composite_trapezoids (op,
pattern,
surface->current_page,
antialias,
@@ -427,7 +427,7 @@
static cairo_int_status_t
_cairo_ps_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_surface,
int source_x,
@@ -456,7 +456,7 @@
_cairo_font_subset_use_glyph (subset, glyphs[i].index);
return _cairo_surface_old_show_glyphs (scaled_font,
- operator,
+ op,
pattern,
surface->current_page,
source_x,
@@ -471,19 +471,19 @@
static cairo_int_status_t
_cairo_ps_surface_paint (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source)
{
cairo_ps_surface_t *surface = abstract_surface;
assert (_cairo_surface_is_meta (surface->current_page));
- return _cairo_surface_paint (surface->current_page, operator, source);
+ return _cairo_surface_paint (surface->current_page, op, source);
}
static cairo_int_status_t
_cairo_ps_surface_mask (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_pattern_t *mask)
{
@@ -491,13 +491,13 @@
assert (_cairo_surface_is_meta (surface->current_page));
- return _cairo_surface_mask (surface->current_page, operator, source,
+ return _cairo_surface_mask (surface->current_page, op, source,
mask);
}
static cairo_int_status_t
_cairo_ps_surface_stroke (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *style,
@@ -510,7 +510,7 @@
assert (_cairo_surface_is_meta (surface->current_page));
- return _cairo_surface_stroke (surface->current_page, operator, source,
+ return _cairo_surface_stroke (surface->current_page, op, source,
path, style,
ctm, ctm_inverse,
tolerance, antialias);
@@ -518,7 +518,7 @@
static cairo_int_status_t
_cairo_ps_surface_fill (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -529,14 +529,14 @@
assert (_cairo_surface_is_meta (surface->current_page));
- return _cairo_surface_fill (surface->current_page, operator, source,
+ return _cairo_surface_fill (surface->current_page, op, source,
path, fill_rule,
tolerance, antialias);
}
static cairo_int_status_t
_cairo_ps_surface_show_glyphs (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
@@ -546,7 +546,7 @@
assert (_cairo_surface_is_meta (surface->current_page));
- return _cairo_surface_show_glyphs (surface->current_page, operator, source,
+ return _cairo_surface_show_glyphs (surface->current_page, op, source,
glyphs, num_glyphs,
scaled_font);
}
@@ -772,9 +772,9 @@
}
static cairo_bool_t
-operator_always_opaque (cairo_operator_t operator)
+operator_always_opaque (cairo_operator_t op)
{
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_CLEAR:
case CAIRO_OPERATOR_SOURCE:
@@ -804,9 +804,9 @@
}
static cairo_bool_t
-operator_always_translucent (cairo_operator_t operator)
+operator_always_translucent (cairo_operator_t op)
{
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_CLEAR:
case CAIRO_OPERATOR_SOURCE:
@@ -836,12 +836,12 @@
}
static cairo_bool_t
-color_operation_needs_fallback (cairo_operator_t operator,
+color_operation_needs_fallback (cairo_operator_t op,
const cairo_color_t *color)
{
- if (operator_always_opaque (operator))
+ if (operator_always_opaque (op))
return FALSE;
- if (operator_always_translucent (operator))
+ if (operator_always_translucent (op))
return TRUE;
return color_is_translucent (color);
}
@@ -855,14 +855,14 @@
}
static cairo_bool_t
-pattern_operation_needs_fallback (cairo_operator_t operator,
+pattern_operation_needs_fallback (cairo_operator_t op,
const cairo_pattern_t *pattern)
{
if (! pattern_type_supported (pattern))
return TRUE;
- if (operator_always_opaque (operator))
+ if (operator_always_opaque (op))
return FALSE;
- if (operator_always_translucent (operator))
+ if (operator_always_translucent (op))
return TRUE;
return pattern_is_translucent (pattern);
}
@@ -1069,7 +1069,7 @@
static cairo_int_status_t
-_ps_output_composite (cairo_operator_t operator,
+_ps_output_composite (cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -1146,7 +1146,7 @@
static cairo_int_status_t
_ps_output_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -1162,7 +1162,7 @@
if (!num_rects)
return CAIRO_STATUS_SUCCESS;
- if (color_operation_needs_fallback (operator, color)) {
+ if (color_operation_needs_fallback (op, color)) {
int min_x = rects[0].x;
int min_y = rects[0].y;
int max_x = rects[0].x + rects[0].width;
@@ -1207,7 +1207,7 @@
}
static cairo_int_status_t
-_ps_output_composite_trapezoids (cairo_operator_t operator,
+_ps_output_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_dst,
cairo_antialias_t antialias,
@@ -1227,7 +1227,7 @@
if (surface->fallback)
return CAIRO_STATUS_SUCCESS;
- if (pattern_operation_needs_fallback (operator, pattern))
+ if (pattern_operation_needs_fallback (op, pattern))
return _ps_output_add_fallback_area (surface, x_dst, y_dst, width, height);
_cairo_output_stream_printf (stream,
@@ -1390,7 +1390,7 @@
static cairo_int_status_t
_ps_output_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_surface,
int source_x,
@@ -1417,7 +1417,7 @@
if (surface->fallback)
return CAIRO_STATUS_SUCCESS;
- if (pattern_operation_needs_fallback (operator, pattern))
+ if (pattern_operation_needs_fallback (op, pattern))
return _ps_output_add_fallback_area (surface, dest_x, dest_y, width, height);
_cairo_output_stream_printf (stream,
@@ -1460,12 +1460,12 @@
* better here. */
static cairo_int_status_t
_ps_output_paint (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source)
{
ps_output_surface_t *surface = abstract_surface;
- if (pattern_operation_needs_fallback (operator, source))
+ if (pattern_operation_needs_fallback (op, source))
return _ps_output_add_fallback_area (surface,
0, 0,
surface->parent->width,
@@ -1482,13 +1482,13 @@
* better here. */
static cairo_int_status_t
_ps_output_mask (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_pattern_t *mask)
{
ps_output_surface_t *surface = abstract_surface;
- if (pattern_operation_needs_fallback (operator, source))
+ if (pattern_operation_needs_fallback (op, source))
return _ps_output_add_fallback_area (surface,
0, 0,
surface->parent->width,
@@ -1505,7 +1505,7 @@
* better here. */
static cairo_int_status_t
_ps_output_stroke (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *style,
@@ -1516,7 +1516,7 @@
{
ps_output_surface_t *surface = abstract_surface;
- if (pattern_operation_needs_fallback (operator, source))
+ if (pattern_operation_needs_fallback (op, source))
return _ps_output_add_fallback_area (surface,
0, 0,
surface->parent->width,
@@ -1531,7 +1531,7 @@
static cairo_int_status_t
_ps_output_fill (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -1544,7 +1544,7 @@
ps_output_path_info_t info;
const char *ps_operator;
- if (pattern_operation_needs_fallback (operator, source))
+ if (pattern_operation_needs_fallback (op, source))
return _ps_output_add_fallback_area (surface,
0, 0,
surface->parent->width,
@@ -1586,7 +1586,7 @@
* better here. */
static cairo_int_status_t
_ps_output_show_glyphs (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
@@ -1594,7 +1594,7 @@
{
ps_output_surface_t *surface = abstract_surface;
- if (pattern_operation_needs_fallback (operator, source))
+ if (pattern_operation_needs_fallback (op, source))
return _ps_output_add_fallback_area (surface,
0, 0,
surface->parent->width,
Index: cairo-scaled-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-scaled-font.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cairo-scaled-font.c 9 Nov 2005 01:16:21 -0000 1.8
+++ cairo-scaled-font.c 16 Dec 2005 11:02:35 -0000 1.9
@@ -776,7 +776,7 @@
cairo_status_t
_cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *surface,
int source_x,
@@ -795,14 +795,14 @@
/* These operators aren't interpreted the same way by the backends;
* they are implemented in terms of other operators in cairo-gstate.c
*/
- assert (operator != CAIRO_OPERATOR_SOURCE && operator != CAIRO_OPERATOR_CLEAR);
+ assert (op != CAIRO_OPERATOR_SOURCE && op != CAIRO_OPERATOR_CLEAR);
if (scaled_font->status)
return scaled_font->status;
if (scaled_font->backend->show_glyphs != NULL) {
status = scaled_font->backend->show_glyphs (scaled_font,
- operator, pattern,
+ op, pattern,
surface,
source_x, source_y,
dest_x, dest_y,
@@ -887,7 +887,7 @@
_cairo_pattern_init_for_surface (&mask_pattern, mask);
- status = _cairo_surface_composite (operator, pattern, &mask_pattern.base,
+ status = _cairo_surface_composite (op, pattern, &mask_pattern.base,
surface,
source_x, source_y,
0, 0,
Index: cairo-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-surface.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- cairo-surface.c 7 Dec 2005 20:19:10 -0000 1.113
+++ cairo-surface.c 16 Dec 2005 11:02:35 -0000 1.114
@@ -855,7 +855,7 @@
}
static cairo_status_t
-_fallback_composite (cairo_operator_t operator,
+_fallback_composite (cairo_operator_t op,
cairo_pattern_t *src,
cairo_pattern_t *mask,
cairo_surface_t *dst,
@@ -878,7 +878,7 @@
return status;
}
- status = state.image->base.backend->composite (operator, src, mask,
+ status = state.image->base.backend->composite (op, src, mask,
&state.image->base,
src_x, src_y, mask_x, mask_y,
dst_x - state.image_rect.x,
@@ -890,7 +890,7 @@
}
cairo_status_t
-_cairo_surface_composite (cairo_operator_t operator,
+_cairo_surface_composite (cairo_operator_t op,
cairo_pattern_t *src,
cairo_pattern_t *mask,
cairo_surface_t *dst,
@@ -911,7 +911,7 @@
/* These operators aren't interpreted the same way by the backends;
* they are implemented in terms of other operators in cairo-gstate.c
*/
- assert (operator != CAIRO_OPERATOR_SOURCE && operator != CAIRO_OPERATOR_CLEAR);
+ assert (op != CAIRO_OPERATOR_SOURCE && op != CAIRO_OPERATOR_CLEAR);
}
if (dst->status)
@@ -921,7 +921,7 @@
return CAIRO_STATUS_SURFACE_FINISHED;
if (dst->backend->composite) {
- status = dst->backend->composite (operator,
+ status = dst->backend->composite (op,
src, mask, dst,
src_x, src_y,
mask_x, mask_y,
@@ -931,7 +931,7 @@
return status;
}
- return _fallback_composite (operator,
+ return _fallback_composite (op,
src, mask, dst,
src_x, src_y,
mask_x, mask_y,
@@ -942,7 +942,7 @@
/**
* _cairo_surface_fill_rectangle:
* @surface: a #cairo_surface_t
- * @operator: the operator to apply to the rectangle
+ * @op: the operator to apply to the rectangle
* @color: the source color
* @x: X coordinate of rectangle, in backend coordinates
* @y: Y coordinate of rectangle, in backend coordinates
@@ -956,7 +956,7 @@
**/
cairo_status_t
_cairo_surface_fill_rectangle (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
int x,
int y,
@@ -978,13 +978,13 @@
rect.width = width;
rect.height = height;
- return _cairo_surface_fill_rectangles (surface, operator, color, &rect, 1);
+ return _cairo_surface_fill_rectangles (surface, op, color, &rect, 1);
}
/**
* _cairo_surface_fill_region:
* @surface: a #cairo_surface_t
- * @operator: the operator to apply to the region
+ * @op: the operator to apply to the region
* @color: the source color
* @region: the region to modify, in backend coordinates
*
@@ -996,7 +996,7 @@
**/
cairo_status_t
_cairo_surface_fill_region (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
pixman_region16_t *region)
{
@@ -1022,7 +1022,7 @@
rects[i].height = boxes[i].y2 - boxes[i].y1;
}
- status = _cairo_surface_fill_rectangles (surface, operator,
+ status = _cairo_surface_fill_rectangles (surface, op,
color, rects, num_rects);
free (rects);
@@ -1032,7 +1032,7 @@
static cairo_status_t
_fallback_fill_rectangles (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -1095,7 +1095,7 @@
}
status = state.image->base.backend->fill_rectangles (&state.image->base,
- operator, color,
+ op, color,
rects, num_rects);
free (offset_rects);
@@ -1109,7 +1109,7 @@
/**
* _cairo_surface_fill_rectangles:
* @surface: a #cairo_surface_t
- * @operator: the operator to apply to the region
+ * @op: the operator to apply to the region
* @color: the source color
* @rects: the rectangles to modify, in backend coordinates
* @num_rects: the number of rectangles in @rects
@@ -1124,7 +1124,7 @@
**/
cairo_status_t
_cairo_surface_fill_rectangles (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -1144,19 +1144,19 @@
if (surface->backend->fill_rectangles) {
status = surface->backend->fill_rectangles (surface,
- operator,
+ op,
color,
rects, num_rects);
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
return status;
}
- return _fallback_fill_rectangles (surface, operator, color, rects, num_rects);
+ return _fallback_fill_rectangles (surface, op, color, rects, num_rects);
}
static cairo_status_t
_fallback_paint (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source)
{
cairo_status_t status;
@@ -1168,7 +1168,7 @@
if (status)
return status;
- if (_cairo_operator_bounded_by_source (operator)) {
+ if (_cairo_operator_bounded_by_source (op)) {
cairo_rectangle_t source_extents;
status = _cairo_pattern_get_extents (source, &source_extents);
if (status)
@@ -1191,7 +1191,7 @@
return status;
_cairo_surface_clip_and_composite_trapezoids (source,
- operator,
+ op,
surface,
&traps,
surface->clip,
@@ -1204,7 +1204,7 @@
cairo_status_t
_cairo_surface_paint (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source)
{
cairo_status_t status;
@@ -1212,17 +1212,17 @@
assert (! surface->is_snapshot);
if (surface->backend->paint) {
- status = surface->backend->paint (surface, operator, source);
+ status = surface->backend->paint (surface, op, source);
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
return status;
}
- return _fallback_paint (surface, operator, source);
+ return _fallback_paint (surface, op, source);
}
static cairo_status_t
_cairo_surface_mask_draw_func (void *closure,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_surface_t *dst,
int dst_x,
@@ -1232,14 +1232,14 @@
cairo_pattern_t *mask = closure;
if (src)
- return _cairo_surface_composite (operator,
+ return _cairo_surface_composite (op,
src, mask, dst,
extents->x, extents->y,
extents->x, extents->y,
extents->x - dst_x, extents->y - dst_y,
extents->width, extents->height);
else
- return _cairo_surface_composite (operator,
+ return _cairo_surface_composite (op,
mask, NULL, dst,
extents->x, extents->y,
0, 0, /* unused */
@@ -1249,7 +1249,7 @@
static cairo_status_t
_fallback_mask (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_pattern_t *mask)
{
@@ -1260,7 +1260,7 @@
if (status)
return status;
- if (_cairo_operator_bounded_by_source (operator)) {
+ if (_cairo_operator_bounded_by_source (op)) {
status = _cairo_pattern_get_extents (source, &source_extents);
if (status)
return status;
@@ -1268,7 +1268,7 @@
_cairo_rectangle_intersect (&extents, &source_extents);
}
- if (_cairo_operator_bounded_by_mask (operator)) {
+ if (_cairo_operator_bounded_by_mask (op)) {
status = _cairo_pattern_get_extents (mask, &mask_extents);
if (status)
return status;
@@ -1280,7 +1280,7 @@
if (status)
return status;
- status = _cairo_gstate_clip_and_composite (surface->clip, operator,
+ status = _cairo_gstate_clip_and_composite (surface->clip, op,
source,
_cairo_surface_mask_draw_func,
mask,
@@ -1292,7 +1292,7 @@
cairo_status_t
_cairo_surface_mask (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_pattern_t *mask)
{
@@ -1301,17 +1301,17 @@
assert (! surface->is_snapshot);
if (surface->backend->mask) {
- status = surface->backend->mask (surface, operator, source, mask);
+ status = surface->backend->mask (surface, op, source, mask);
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
return status;
}
- return _fallback_mask (surface, operator, source, mask);
+ return _fallback_mask (surface, op, source, mask);
}
static cairo_status_t
_fallback_stroke (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *stroke_style,
@@ -1336,7 +1336,7 @@
}
_cairo_surface_clip_and_composite_trapezoids (source,
- operator,
+ op,
surface,
&traps,
surface->clip,
@@ -1349,7 +1349,7 @@
cairo_status_t
_cairo_surface_stroke (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *stroke_style,
@@ -1362,7 +1362,7 @@
if (surface->backend->stroke) {
cairo_status_t status;
- status = surface->backend->stroke (surface, operator, source,
+ status = surface->backend->stroke (surface, op, source,
path, stroke_style,
ctm, ctm_inverse,
tolerance, antialias);
@@ -1370,7 +1370,7 @@
return status;
}
- return _fallback_stroke (surface, operator, source,
+ return _fallback_stroke (surface, op, source,
path, stroke_style,
ctm, ctm_inverse,
tolerance, antialias);
@@ -1378,7 +1378,7 @@
static cairo_status_t
_fallback_fill (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -1400,7 +1400,7 @@
}
status = _cairo_surface_clip_and_composite_trapezoids (source,
- operator,
+ op,
surface,
&traps,
surface->clip,
@@ -1413,7 +1413,7 @@
cairo_status_t
_cairo_surface_fill (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -1425,20 +1425,20 @@
assert (! surface->is_snapshot);
if (surface->backend->fill) {
- status = surface->backend->fill (surface, operator, source,
+ status = surface->backend->fill (surface, op, source,
path, fill_rule,
tolerance, antialias);
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
return status;
}
- return _fallback_fill (surface, operator, source,
+ return _fallback_fill (surface, op, source,
path, fill_rule,
tolerance, antialias);
}
static cairo_status_t
-_fallback_composite_trapezoids (cairo_operator_t operator,
+_fallback_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *dst,
cairo_antialias_t antialias,
@@ -1492,7 +1492,7 @@
traps = offset_traps;
}
- state.image->base.backend->composite_trapezoids (operator, pattern,
+ state.image->base.backend->composite_trapezoids (op, pattern,
&state.image->base,
antialias,
src_x, src_y,
@@ -1509,7 +1509,7 @@
}
cairo_status_t
-_cairo_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *dst,
cairo_antialias_t antialias,
@@ -1529,7 +1529,7 @@
/* These operators aren't interpreted the same way by the backends;
* they are implemented in terms of other operators in cairo-gstate.c
*/
- assert (operator != CAIRO_OPERATOR_SOURCE && operator != CAIRO_OPERATOR_CLEAR);
+ assert (op != CAIRO_OPERATOR_SOURCE && op != CAIRO_OPERATOR_CLEAR);
if (dst->status)
return dst->status;
@@ -1538,7 +1538,7 @@
return CAIRO_STATUS_SURFACE_FINISHED;
if (dst->backend->composite_trapezoids) {
- status = dst->backend->composite_trapezoids (operator,
+ status = dst->backend->composite_trapezoids (op,
pattern, dst,
antialias,
src_x, src_y,
@@ -1549,7 +1549,7 @@
return status;
}
- return _fallback_composite_trapezoids (operator, pattern, dst,
+ return _fallback_composite_trapezoids (op, pattern, dst,
antialias,
src_x, src_y,
dst_x, dst_y,
@@ -1843,7 +1843,7 @@
static cairo_status_t
_cairo_surface_old_show_glyphs_draw_func (void *closure,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_surface_t *dst,
int dst_x,
@@ -1872,7 +1872,7 @@
if (!src)
src = &pattern.base;
- status = _cairo_surface_old_show_glyphs (glyph_info->font, operator, src,
+ status = _cairo_surface_old_show_glyphs (glyph_info->font, op, src,
dst,
extents->x, extents->y,
extents->x - dst_x,
@@ -1886,7 +1886,7 @@
return status;
status = _cairo_scaled_font_show_glyphs (glyph_info->font,
- operator,
+ op,
src, dst,
extents->x, extents->y,
extents->x - dst_x, extents->y - dst_y,
@@ -1902,7 +1902,7 @@
static cairo_status_t
_fallback_show_glyphs (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
@@ -1916,7 +1916,7 @@
if (status)
return status;
- if (_cairo_operator_bounded_by_mask (operator)) {
+ if (_cairo_operator_bounded_by_mask (op)) {
status = _cairo_scaled_font_glyph_device_extents (scaled_font,
glyphs,
num_glyphs,
@@ -1936,7 +1936,7 @@
glyph_info.num_glyphs = num_glyphs;
status = _cairo_gstate_clip_and_composite (surface->clip,
- operator,
+ op,
source,
_cairo_surface_old_show_glyphs_draw_func,
&glyph_info,
@@ -1948,7 +1948,7 @@
cairo_status_t
_cairo_surface_show_glyphs (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
@@ -1959,14 +1959,14 @@
assert (! surface->is_snapshot);
if (surface->backend->show_glyphs) {
- status = surface->backend->show_glyphs (surface, operator, source,
+ status = surface->backend->show_glyphs (surface, op, source,
glyphs, num_glyphs,
scaled_font);
if (status != CAIRO_INT_STATUS_UNSUPPORTED)
return status;
}
- return _fallback_show_glyphs (surface, operator, source,
+ return _fallback_show_glyphs (surface, op, source,
glyphs, num_glyphs,
scaled_font);
}
@@ -1978,7 +1978,7 @@
* cleaned up in terms of both semantics and naming). */
cairo_status_t
_cairo_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *dst,
int source_x,
@@ -2002,7 +2002,7 @@
if (dst->backend->old_show_glyphs)
status = dst->backend->old_show_glyphs (scaled_font,
- operator, pattern, dst,
+ op, pattern, dst,
source_x, source_y,
dest_x, dest_y,
width, height,
Index: cairo-svg-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-svg-surface.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo-svg-surface.c 8 Dec 2005 21:09:27 -0000 1.1
+++ cairo-svg-surface.c 16 Dec 2005 11:02:35 -0000 1.2
@@ -421,7 +421,7 @@
}
static cairo_int_status_t
-_cairo_svg_surface_composite (cairo_operator_t operator,
+_cairo_svg_surface_composite (cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -448,7 +448,7 @@
}
static void
-emit_operator (cairo_operator_t operator, cairo_svg_surface_t *surface,
+emit_operator (cairo_operator_t op, cairo_svg_surface_t *surface,
xmlBufferPtr style)
{
char const *op_str[] = {
@@ -462,12 +462,12 @@
xmlBufferPtr id;
char buffer[CAIRO_SVG_DTOSTR_BUFFER_LEN];
- if (op_str[operator] == NULL)
+ if (op_str[op] == NULL)
return;
child = xmlNewChild (document->xml_node_defs, NULL, CC2XML ("filter"), NULL);
primitive = xmlNewChild (child, NULL, CC2XML ("feComposite"), NULL);
- xmlSetProp (primitive, CC2XML ("operator"), CC2XML (op_str[operator]));
+ xmlSetProp (primitive, CC2XML ("operator"), CC2XML (op_str[op]));
xmlSetProp (primitive, CC2XML ("in"), CC2XML ("SourceGraphic"));
xmlSetProp (primitive, CC2XML ("in2"), CC2XML ("BackgroundImage"));
@@ -852,7 +852,7 @@
static cairo_int_status_t
_cairo_svg_surface_fill (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -873,7 +873,7 @@
style = xmlBufferCreate ();
emit_pattern (surface, source, style, 0);
xmlBufferCat (style, " stroke: none;");
- emit_operator (operator, surface, style);
+ emit_operator (op, surface, style);
status = _cairo_path_fixed_interpret (path,
CAIRO_DIRECTION_FORWARD,
@@ -903,7 +903,7 @@
}
static cairo_int_status_t
-_cairo_svg_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_svg_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_dst,
cairo_antialias_t antialias,
@@ -1000,7 +1000,7 @@
static cairo_int_status_t
_cairo_svg_surface_stroke (void *abstract_dst,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *stroke_style,
@@ -1097,7 +1097,7 @@
static cairo_int_status_t
_cairo_svg_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_surface,
int source_x,
@@ -1127,7 +1127,7 @@
if (status)
return status;
- status = _cairo_svg_surface_fill (abstract_surface, operator, pattern,
+ status = _cairo_svg_surface_fill (abstract_surface, op, pattern,
&path, CAIRO_FILL_RULE_WINDING, 0.0, CAIRO_ANTIALIAS_SUBPIXEL);
_cairo_path_fixed_fini (&path);
Index: cairo-win32-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-font.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cairo-win32-font.c 5 Nov 2005 00:13:31 -0000 1.44
+++ cairo-win32-font.c 16 Dec 2005 11:02:35 -0000 1.45
@@ -1103,7 +1103,7 @@
static cairo_int_status_t
_cairo_win32_scaled_font_show_glyphs (void *abstract_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *generic_surface,
int source_x,
@@ -1124,7 +1124,7 @@
if (_cairo_surface_is_win32 (generic_surface) &&
surface->format == CAIRO_FORMAT_RGB24 &&
- operator == CAIRO_OPERATOR_OVER &&
+ op == CAIRO_OPERATOR_OVER &&
_cairo_pattern_is_opaque_solid (pattern)) {
cairo_solid_pattern_t *solid_pattern = (cairo_solid_pattern_t *)pattern;
@@ -1193,13 +1193,13 @@
return CAIRO_STATUS_NO_MEMORY;
}
- /* For operator == OVER, no-cleartype, a possible optimization here is to
+ /* For op == OVER, no-cleartype, a possible optimization here is to
* draw onto an intermediate ARGB32 surface and alpha-blend that with the
* destination
*/
_cairo_pattern_init_for_surface (&mask, mask_surface);
- status = _cairo_surface_composite (operator, pattern,
+ status = _cairo_surface_composite (op, pattern,
&mask.base,
&surface->base,
source_x, source_y,
Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cairo-win32-surface.c 4 Nov 2005 19:16:40 -0000 1.38
+++ cairo-win32-surface.c 16 Dec 2005 11:02:35 -0000 1.39
@@ -614,7 +614,7 @@
}
static cairo_int_status_t
-_cairo_win32_surface_composite (cairo_operator_t operator,
+_cairo_win32_surface_composite (cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -662,8 +662,8 @@
if (alpha == 255 &&
src->format == dst->format &&
- (operator == CAIRO_OPERATOR_SOURCE ||
- (src->format == CAIRO_FORMAT_RGB24 && operator == CAIRO_OPERATOR_OVER))) {
+ (op == CAIRO_OPERATOR_SOURCE ||
+ (src->format == CAIRO_FORMAT_RGB24 && op == CAIRO_OPERATOR_OVER))) {
if (!BitBlt (dst->dc,
dst_x, dst_y,
@@ -678,7 +678,7 @@
} else if (integer_transform &&
(src->format == CAIRO_FORMAT_RGB24 || src->format == CAIRO_FORMAT_ARGB32) &&
dst->format == CAIRO_FORMAT_RGB24 &&
- operator == CAIRO_OPERATOR_OVER) {
+ op == CAIRO_OPERATOR_OVER) {
return _composite_alpha_blend (dst, src, alpha,
src_x + itx, src_y + ity,
@@ -695,7 +695,7 @@
* super-luminescent colors (a == 0, r,g,b > 0)
*/
static enum { DO_CLEAR, DO_SOURCE, DO_NOTHING, DO_UNSUPPORTED }
-categorize_solid_dest_operator (cairo_operator_t operator,
+categorize_solid_dest_operator (cairo_operator_t op,
unsigned short alpha)
{
enum { SOURCE_TRANSPARENT, SOURCE_LIGHT, SOURCE_SOLID, SOURCE_OTHER } source;
@@ -707,7 +707,7 @@
else
source = SOURCE_OTHER;
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_CLEAR: /* 0 0 */
case CAIRO_OPERATOR_OUT: /* 1 - Ab 0 */
return DO_CLEAR;
@@ -768,7 +768,7 @@
static cairo_int_status_t
_cairo_win32_surface_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -788,7 +788,7 @@
/* Optimize for no destination alpha (surface->pixman_image is non-NULL for all
* surfaces with alpha.)
*/
- switch (categorize_solid_dest_operator (operator, color->alpha_short)) {
+ switch (categorize_solid_dest_operator (op, color->alpha_short)) {
case DO_CLEAR:
new_color = RGB (0, 0, 0);
break;
Index: cairo-xcb-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xcb-surface.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- cairo-xcb-surface.c 4 Nov 2005 19:16:40 -0000 1.52
+++ cairo-xcb-surface.c 16 Dec 2005 11:02:35 -0000 1.53
@@ -799,9 +799,9 @@
}
static int
-_render_operator (cairo_operator_t operator)
+_render_operator (cairo_operator_t op)
{
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_CLEAR:
return XCBRenderPictOpClear;
case CAIRO_OPERATOR_SOURCE:
@@ -836,7 +836,7 @@
}
static cairo_int_status_t
-_cairo_xcb_surface_composite (cairo_operator_t operator,
+_cairo_xcb_surface_composite (cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -877,7 +877,7 @@
status = _cairo_xcb_surface_set_attributes (mask, &mask_attr);
if (status == CAIRO_STATUS_SUCCESS)
XCBRenderComposite (dst->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->picture,
mask->picture,
dst->picture,
@@ -893,7 +893,7 @@
static XCBRenderPICTURE maskpict = { 0 };
XCBRenderComposite (dst->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->picture,
maskpict,
dst->picture,
@@ -915,7 +915,7 @@
static cairo_int_status_t
_cairo_xcb_surface_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -933,7 +933,7 @@
/* XXX: This XCBRECTANGLE cast is evil... it needs to go away somehow. */
XCBRenderFillRectangles (surface->dpy,
- _render_operator (operator),
+ _render_operator (op),
surface->picture,
render_color, num_rects, (XCBRECTANGLE *) rects);
@@ -941,7 +941,7 @@
}
static cairo_int_status_t
-_cairo_xcb_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_xcb_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_dst,
cairo_antialias_t antialias,
@@ -997,7 +997,7 @@
status = _cairo_xcb_surface_set_attributes (src, &attributes);
if (status == CAIRO_STATUS_SUCCESS)
XCBRenderTrapezoids (dst->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->picture, dst->picture,
render_format.id,
render_src_x + attributes.x_offset,
Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- cairo-xlib-surface.c 4 Nov 2005 19:16:40 -0000 1.127
+++ cairo-xlib-surface.c 16 Dec 2005 11:02:35 -0000 1.128
@@ -995,14 +995,14 @@
* requires alpha compositing to complete.
*/
static cairo_bool_t
-_operator_needs_alpha_composite (cairo_operator_t operator,
+_operator_needs_alpha_composite (cairo_operator_t op,
cairo_bool_t surface_has_alpha)
{
- if (operator == CAIRO_OPERATOR_SOURCE ||
+ if (op == CAIRO_OPERATOR_SOURCE ||
(!surface_has_alpha &&
- (operator == CAIRO_OPERATOR_OVER ||
- operator == CAIRO_OPERATOR_ATOP ||
- operator == CAIRO_OPERATOR_IN)))
+ (op == CAIRO_OPERATOR_OVER ||
+ op == CAIRO_OPERATOR_ATOP ||
+ op == CAIRO_OPERATOR_IN)))
return FALSE;
return TRUE;
@@ -1039,7 +1039,7 @@
*/
static composite_operation_t
_categorize_composite_operation (cairo_xlib_surface_t *dst,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_bool_t have_mask)
@@ -1060,13 +1060,13 @@
* fallback is impossible.
*/
if (have_mask ||
- !(operator == CAIRO_OPERATOR_SOURCE || operator == CAIRO_OPERATOR_OVER))
+ !(op == CAIRO_OPERATOR_SOURCE || op == CAIRO_OPERATOR_OVER))
return DO_UNSUPPORTED;
if (_cairo_surface_is_xlib (surface_pattern->surface)) {
cairo_xlib_surface_t *src = (cairo_xlib_surface_t *)surface_pattern->surface;
- if (operator == CAIRO_OPERATOR_OVER && _surface_has_alpha (src))
+ if (op == CAIRO_OPERATOR_OVER && _surface_has_alpha (src))
return DO_UNSUPPORTED;
/* If these are on the same screen but otherwise incompatible,
@@ -1099,7 +1099,7 @@
*/
static composite_operation_t
_recategorize_composite_operation (cairo_xlib_surface_t *dst,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_xlib_surface_t *src,
cairo_surface_attributes_t *src_attr,
cairo_bool_t have_mask)
@@ -1107,7 +1107,7 @@
cairo_bool_t is_integer_translation =
_cairo_matrix_is_integer_translation (&src_attr->matrix, NULL, NULL);
cairo_bool_t needs_alpha_composite =
- _operator_needs_alpha_composite (operator, _surface_has_alpha (src));
+ _operator_needs_alpha_composite (op, _surface_has_alpha (src));
if (!have_mask &&
is_integer_translation &&
@@ -1139,9 +1139,9 @@
}
static int
-_render_operator (cairo_operator_t operator)
+_render_operator (cairo_operator_t op)
{
- switch (operator) {
+ switch (op) {
case CAIRO_OPERATOR_CLEAR:
return PictOpClear;
@@ -1179,7 +1179,7 @@
}
static cairo_int_status_t
-_cairo_xlib_surface_composite (cairo_operator_t operator,
+_cairo_xlib_surface_composite (cairo_operator_t op,
cairo_pattern_t *src_pattern,
cairo_pattern_t *mask_pattern,
void *abstract_dst,
@@ -1203,7 +1203,7 @@
if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst))
return CAIRO_INT_STATUS_UNSUPPORTED;
- operation = _categorize_composite_operation (dst, operator, src_pattern,
+ operation = _categorize_composite_operation (dst, op, src_pattern,
mask_pattern != NULL);
if (operation == DO_UNSUPPORTED)
return CAIRO_INT_STATUS_UNSUPPORTED;
@@ -1219,7 +1219,7 @@
if (status)
return status;
- operation = _recategorize_composite_operation (dst, operator, src, &src_attr,
+ operation = _recategorize_composite_operation (dst, op, src, &src_attr,
mask_pattern != NULL);
if (operation == DO_UNSUPPORTED) {
status = CAIRO_INT_STATUS_UNSUPPORTED;
@@ -1240,7 +1240,7 @@
goto FAIL;
XRenderComposite (dst->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->src_picture,
mask->src_picture,
dst->dst_picture,
@@ -1252,7 +1252,7 @@
width, height);
} else {
XRenderComposite (dst->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->src_picture,
0,
dst->dst_picture,
@@ -1302,7 +1302,7 @@
ASSERT_NOT_REACHED;
}
- if (!_cairo_operator_bounded_by_source (operator))
+ if (!_cairo_operator_bounded_by_source (op))
status = _cairo_surface_composite_fixup_unbounded (&dst->base,
&src_attr, src->width, src->height,
mask ? &mask_attr : NULL,
@@ -1324,7 +1324,7 @@
static cairo_int_status_t
_cairo_xlib_surface_fill_rectangles (void *abstract_surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects)
@@ -1343,7 +1343,7 @@
/* XXX: This XRectangle cast is evil... it needs to go away somehow. */
_cairo_xlib_surface_ensure_dst_picture (surface);
XRenderFillRectangles (surface->dpy,
- _render_operator (operator),
+ _render_operator (op),
surface->dst_picture,
&render_color, (XRectangle *) rects, num_rects);
@@ -1442,7 +1442,7 @@
}
static cairo_int_status_t
-_cairo_xlib_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_xlib_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_dst,
cairo_antialias_t antialias,
@@ -1467,7 +1467,7 @@
if (!CAIRO_SURFACE_RENDER_HAS_TRAPEZOIDS (dst))
return CAIRO_INT_STATUS_UNSUPPORTED;
- operation = _categorize_composite_operation (dst, operator, pattern, TRUE);
+ operation = _categorize_composite_operation (dst, op, pattern, TRUE);
if (operation == DO_UNSUPPORTED)
return CAIRO_INT_STATUS_UNSUPPORTED;
@@ -1478,7 +1478,7 @@
if (status)
return status;
- operation = _recategorize_composite_operation (dst, operator, src, &attributes, TRUE);
+ operation = _recategorize_composite_operation (dst, op, src, &attributes, TRUE);
if (operation == DO_UNSUPPORTED) {
status = CAIRO_INT_STATUS_UNSUPPORTED;
goto FAIL;
@@ -1509,7 +1509,7 @@
if (status)
goto FAIL;
- if (!_cairo_operator_bounded_by_mask (operator)) {
+ if (!_cairo_operator_bounded_by_mask (op)) {
/* XRenderCompositeTrapezoids() creates a mask only large enough for the
* trapezoids themselves, but if the operator is unbounded, then we need
* to actually composite all the way out to the bounds, so we create
@@ -1528,7 +1528,7 @@
}
XRenderComposite (dst->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->src_picture,
mask_picture,
dst->dst_picture,
@@ -1551,7 +1551,7 @@
} else {
/* XXX: The XTrapezoid cast is evil and needs to go away somehow. */
XRenderCompositeTrapezoids (dst->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->src_picture, dst->dst_picture,
pict_format,
render_src_x + attributes.x_offset,
@@ -1655,7 +1655,7 @@
static cairo_int_status_t
_cairo_xlib_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_surface,
int source_x,
@@ -2201,7 +2201,7 @@
static cairo_status_t
_cairo_xlib_surface_old_show_glyphs8 (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_xlib_surface_t *src,
cairo_xlib_surface_t *self,
int source_x,
@@ -2247,7 +2247,7 @@
}
XRenderCompositeText8 (self->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->src_picture,
self->dst_picture,
font_private->format,
@@ -2263,7 +2263,7 @@
static cairo_status_t
_cairo_xlib_surface_old_show_glyphs16 (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_xlib_surface_t *src,
cairo_xlib_surface_t *self,
int source_x,
@@ -2309,7 +2309,7 @@
}
XRenderCompositeText16 (self->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->src_picture,
self->dst_picture,
font_private->format,
@@ -2325,7 +2325,7 @@
static cairo_status_t
_cairo_xlib_surface_old_show_glyphs32 (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_xlib_surface_t *src,
cairo_xlib_surface_t *self,
int source_x,
@@ -2371,7 +2371,7 @@
}
XRenderCompositeText32 (self->dpy,
- _render_operator (operator),
+ _render_operator (op),
src->src_picture,
self->dst_picture,
font_private->format,
@@ -2387,7 +2387,7 @@
static cairo_int_status_t
_cairo_xlib_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
void *abstract_surface,
int source_x,
@@ -2413,7 +2413,7 @@
if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT (self) || !self->format)
return CAIRO_INT_STATUS_UNSUPPORTED;
- operation = _categorize_composite_operation (self, operator, pattern, TRUE);
+ operation = _categorize_composite_operation (self, op, pattern, TRUE);
if (operation == DO_UNSUPPORTED)
return CAIRO_INT_STATUS_UNSUPPORTED;
@@ -2430,7 +2430,7 @@
if (status)
return status;
- operation = _recategorize_composite_operation (self, operator, src, &attributes, TRUE);
+ operation = _recategorize_composite_operation (self, op, src, &attributes, TRUE);
if (operation == DO_UNSUPPORTED) {
status = CAIRO_INT_STATUS_UNSUPPORTED;
goto FAIL;
@@ -2460,22 +2460,22 @@
/* Call the appropriate sub-function. */
if (max_index < 256)
- status = _cairo_xlib_surface_old_show_glyphs8 (scaled_font, operator, src, self,
+ status = _cairo_xlib_surface_old_show_glyphs8 (scaled_font, op, src, self,
source_x + attributes.x_offset - dest_x,
source_y + attributes.y_offset - dest_y,
glyphs, num_glyphs);
else if (max_index < 65536)
- status = _cairo_xlib_surface_old_show_glyphs16 (scaled_font, operator, src, self,
+ status = _cairo_xlib_surface_old_show_glyphs16 (scaled_font, op, src, self,
source_x + attributes.x_offset - dest_x,
source_y + attributes.y_offset - dest_y,
glyphs, num_glyphs);
else
- status = _cairo_xlib_surface_old_show_glyphs32 (scaled_font, operator, src, self,
+ status = _cairo_xlib_surface_old_show_glyphs32 (scaled_font, op, src, self,
source_x + attributes.x_offset - dest_x,
source_y + attributes.y_offset - dest_y,
glyphs, num_glyphs);
- if (status == CAIRO_STATUS_SUCCESS && !_cairo_operator_bounded_by_mask (operator)) {
+ if (status == CAIRO_STATUS_SUCCESS && !_cairo_operator_bounded_by_mask (op)) {
cairo_rectangle_t extents;
status = _cairo_scaled_font_glyph_device_extents (scaled_font,
glyphs,
Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- cairoint.h 8 Dec 2005 21:09:27 -0000 1.231
+++ cairoint.h 16 Dec 2005 11:02:35 -0000 1.232
@@ -523,7 +523,7 @@
uint32_t ucs4);
cairo_int_status_t
(*show_glyphs) (void *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *surface,
int source_x,
@@ -622,7 +622,7 @@
/* XXX: dst should be the first argument for consistency */
cairo_int_status_t
- (*composite) (cairo_operator_t operator,
+ (*composite) (cairo_operator_t op,
cairo_pattern_t *src,
cairo_pattern_t *mask,
void *dst,
@@ -637,14 +637,14 @@
cairo_int_status_t
(*fill_rectangles) (void *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects);
/* XXX: dst should be the first argument for consistency */
cairo_int_status_t
- (*composite_trapezoids) (cairo_operator_t operator,
+ (*composite_trapezoids) (cairo_operator_t op,
cairo_pattern_t *pattern,
void *dst,
cairo_antialias_t antialias,
@@ -722,7 +722,7 @@
*/
cairo_int_status_t
(*old_show_glyphs) (cairo_scaled_font_t *font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
void *surface,
int source_x,
@@ -760,18 +760,18 @@
* naming and argument-order convensions. */
cairo_int_status_t
(*paint) (void *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source);
cairo_int_status_t
(*mask) (void *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_pattern_t *mask);
cairo_int_status_t
(*stroke) (void *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *style,
@@ -782,7 +782,7 @@
cairo_int_status_t
(*fill) (void *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -791,7 +791,7 @@
cairo_int_status_t
(*show_glyphs) (void *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
@@ -1073,7 +1073,7 @@
_cairo_gstate_get_source (cairo_gstate_t *gstate);
cairo_private cairo_status_t
-_cairo_gstate_set_operator (cairo_gstate_t *gstate, cairo_operator_t operator);
+_cairo_gstate_set_operator (cairo_gstate_t *gstate, cairo_operator_t op);
cairo_private cairo_operator_t
_cairo_gstate_get_operator (cairo_gstate_t *gstate);
@@ -1281,7 +1281,7 @@
cairo_path_fixed_t *path);
typedef cairo_status_t (*cairo_draw_func_t) (void *closure,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_surface_t *dst,
int dst_x,
@@ -1290,7 +1290,7 @@
cairo_private cairo_status_t
_cairo_gstate_clip_and_composite (cairo_clip_t *clip,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *src,
cairo_draw_func_t draw_func,
void *draw_closure,
@@ -1298,10 +1298,10 @@
const cairo_rectangle_t *extents);
cairo_private cairo_bool_t
-_cairo_operator_bounded_by_mask (cairo_operator_t operator);
+_cairo_operator_bounded_by_mask (cairo_operator_t op);
cairo_private cairo_bool_t
-_cairo_operator_bounded_by_source (cairo_operator_t operator);
+_cairo_operator_bounded_by_source (cairo_operator_t op);
/* cairo_color.c */
cairo_private const cairo_color_t *
@@ -1528,7 +1528,7 @@
cairo_private cairo_status_t
_cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_surface_t *surface,
int source_x,
@@ -1609,7 +1609,7 @@
_cairo_surface_get_clip_mode (cairo_surface_t *surface);
cairo_private cairo_status_t
-_cairo_surface_composite (cairo_operator_t operator,
+_cairo_surface_composite (cairo_operator_t op,
cairo_pattern_t *src,
cairo_pattern_t *mask,
cairo_surface_t *dst,
@@ -1624,7 +1624,7 @@
cairo_private cairo_status_t
_cairo_surface_fill_rectangle (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
int x,
int y,
@@ -1633,31 +1633,31 @@
cairo_private cairo_status_t
_cairo_surface_fill_region (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
pixman_region16_t *region);
cairo_private cairo_status_t
_cairo_surface_fill_rectangles (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_t *rects,
int num_rects);
cairo_private cairo_status_t
_cairo_surface_paint (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source);
cairo_private cairo_status_t
_cairo_surface_mask (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_pattern_t *mask);
cairo_private cairo_status_t
_cairo_surface_stroke (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_stroke_style_t *style,
@@ -1668,7 +1668,7 @@
cairo_private cairo_status_t
_cairo_surface_fill (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
cairo_path_fixed_t *path,
cairo_fill_rule_t fill_rule,
@@ -1677,14 +1677,14 @@
cairo_private cairo_status_t
_cairo_surface_show_glyphs (cairo_surface_t *surface,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *source,
const cairo_glyph_t *glyphs,
int num_glyphs,
cairo_scaled_font_t *scaled_font);
cairo_private cairo_status_t
-_cairo_surface_composite_trapezoids (cairo_operator_t operator,
+_cairo_surface_composite_trapezoids (cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *dst,
cairo_antialias_t antialias,
@@ -1699,7 +1699,7 @@
cairo_private cairo_status_t
_cairo_surface_clip_and_composite_trapezoids (cairo_pattern_t *src,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_surface_t *dst,
cairo_traps_t *traps,
cairo_clip_t *clip,
@@ -1773,7 +1773,7 @@
cairo_private cairo_status_t
_cairo_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
- cairo_operator_t operator,
+ cairo_operator_t op,
cairo_pattern_t *pattern,
cairo_surface_t *surface,
int source_x,
More information about the cairo-commit
mailing list