From f1044bb3c7753e17833a2dc0db508a80eeb810b7 Mon Sep 17 00:00:00 2001 From: Billy Biggs Date: Mon, 10 Oct 2005 12:45:15 +0000 Subject: [PATCH] Call it CAIRO_EXTEND_PAD instead of CAIRO_EXTEND_NEAREST. Update everybody to use _PAD instead of _NEAREST. --- ChangeLog | 14 ++++++++++++++ src/cairo-glitz-surface.c | 2 +- src/cairo-image-surface.c | 2 +- src/cairo-pattern.c | 2 +- src/cairo-xcb-surface.c | 2 +- src/cairo-xlib-surface.c | 2 +- src/cairo.h | 4 ++-- src/cairoint.h | 2 +- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c04c40ed..02a6dd7fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-10-10 Billy Biggs + + * src/cairo.h: Call it CAIRO_EXTEND_PAD instead of + CAIRO_EXTEND_NEAREST. + + * src/cairoint.h: + * src/cairo-glitz-surface.c: + (_cairo_glitz_pattern_acquire_surface): + * src/cairo-image-surface.c (_cairo_image_surface_set_attributes): + * src/cairo-pattern.c (_cairo_pattern_calc_color_at_pixel): + * src/cairo-xcb-surface.c (_cairo_xcb_surface_set_attributes): + * src/cairo-xlib-surface.c (_cairo_xlib_surface_set_attributes): + Update everybody to use _PAD instead of _NEAREST. + 2005-10-10 Kristian Høgsberg * src/cairo-gstate.c (_cairo_gstate_fill): Transform source diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c index 270e1c816..9f1a0f84e 100644 --- a/src/cairo-glitz-surface.c +++ b/src/cairo-glitz-surface.c @@ -682,7 +682,7 @@ _cairo_glitz_pattern_acquire_surface (cairo_pattern_t *pattern, case CAIRO_EXTEND_REFLECT: attr->fill = GLITZ_FILL_REFLECT; break; - case CAIRO_EXTEND_NEAREST: + case CAIRO_EXTEND_PAD: attr->fill = GLITZ_FILL_NEAREST; break; } diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index 3b581ec10..20d14c170 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -500,7 +500,7 @@ _cairo_image_surface_set_attributes (cairo_image_surface_t *surface, case CAIRO_EXTEND_REFLECT: pixman_image_set_repeat (surface->pixman_image, PIXMAN_REPEAT_REFLECT); break; - case CAIRO_EXTEND_NEAREST: + case CAIRO_EXTEND_PAD: pixman_image_set_repeat (surface->pixman_image, PIXMAN_REPEAT_PAD); break; } diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c index b0be1055d..4fe8227e5 100644 --- a/src/cairo-pattern.c +++ b/src/cairo-pattern.c @@ -955,7 +955,7 @@ _cairo_pattern_calc_color_at_pixel (cairo_shader_op_t *op, factor -= factor & 0xffff0000; } break; - case CAIRO_EXTEND_NEAREST: + case CAIRO_EXTEND_PAD: case CAIRO_EXTEND_NONE: break; } diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c index c46e75f53..49a6aaab3 100644 --- a/src/cairo-xcb-surface.c +++ b/src/cairo-xcb-surface.c @@ -787,7 +787,7 @@ _cairo_xcb_surface_set_attributes (cairo_xcb_surface_t *surface, break; case CAIRO_EXTEND_REFLECT: return CAIRO_INT_STATUS_UNSUPPORTED; - case CAIRO_EXTEND_NEAREST: + case CAIRO_EXTEND_PAD: return CAIRO_INT_STATUS_UNSUPPORTED; } diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index e6a78c08c..3c6caf645 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -937,7 +937,7 @@ _cairo_xlib_surface_set_attributes (cairo_xlib_surface_t *surface, _cairo_xlib_surface_set_repeat (surface, 1); break; case CAIRO_EXTEND_REFLECT: - case CAIRO_EXTEND_NEAREST: + case CAIRO_EXTEND_PAD: return CAIRO_INT_STATUS_UNSUPPORTED; } diff --git a/src/cairo.h b/src/cairo.h index 49f04d017..6d76dc4cf 100644 --- a/src/cairo.h +++ b/src/cairo.h @@ -1296,7 +1296,7 @@ cairo_pattern_get_matrix (cairo_pattern_t *pattern, * @CAIRO_EXTEND_REPEAT: the pattern is tiled by repeating * @CAIRO_EXTEND_REFLECT: the pattern is tiled by reflecting * at the edges - * @CAIRO_EXTEND_NEAREST: pixels outside of the pattern copy + * @CAIRO_EXTEND_PAD: pixels outside of the pattern copy * the closest pixel from the source (since cairo 1.2) * * #cairo_extend_t is used to describe how the area outside @@ -1306,7 +1306,7 @@ typedef enum _cairo_extend { CAIRO_EXTEND_NONE, CAIRO_EXTEND_REPEAT, CAIRO_EXTEND_REFLECT, - CAIRO_EXTEND_NEAREST + CAIRO_EXTEND_PAD } cairo_extend_t; cairo_public void diff --git a/src/cairoint.h b/src/cairoint.h index 744cd7306..9c64d1cf2 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -822,7 +822,7 @@ typedef enum { } cairo_stock_t; #define CAIRO_EXTEND_SURFACE_DEFAULT CAIRO_EXTEND_NONE -#define CAIRO_EXTEND_GRADIENT_DEFAULT CAIRO_EXTEND_NEAREST +#define CAIRO_EXTEND_GRADIENT_DEFAULT CAIRO_EXTEND_PAD #define CAIRO_FILTER_DEFAULT CAIRO_FILTER_BEST typedef enum {