fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-24 09:10:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bogus cairo_rectangle_fixed_t to be cairo_rectangle_int16_t.

Browse source 
This rectangle has regular integer values, not fixed-point values.
So the old name was horribly wrong and misleading, (and yes I think
it was even I that had suggested it).
This commit is contained in:
Carl Worth 2006-06-06 16:54:03 -07:00
parent 5570bf0a9e
commit 746f66c3fc
30 changed files with 155 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cairo-analysis-surface.c
View file

@ -49,7 +49,7 @@ typedef struct {
static cairo_int_status_t
_cairo_analysis_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_analysis_surface_t *surface = abstract_surface;

2
src/cairo-atsui-font.c
View file

@ -574,7 +574,7 @@ _cairo_atsui_font_old_show_glyphs (void *abstract_font,
int i;
void *extra = NULL;
cairo_bool_t can_draw_directly;
cairo_rectangle_fixed_t rect;
cairo_rectangle_int16_t rect;
/* Check if we can draw directly to the destination surface */
can_draw_directly = _cairo_surface_is_quartz (generic_surface) &&

6
src/cairo-clip-private.h
View file

@ -61,7 +61,7 @@ struct _cairo_clip {
* clip paths
*/
cairo_surface_t *surface;
cairo_rectangle_fixed_t surface_rect;
cairo_rectangle_int16_t surface_rect;
/*
* Surface clip serial number to store
* in the surface when this clip is set
@ -105,7 +105,7 @@ _cairo_clip_clip (cairo_clip_t *clip,
cairo_private cairo_status_t
_cairo_clip_intersect_to_rectangle (cairo_clip_t *clip,
cairo_rectangle_fixed_t *rectangle);
cairo_rectangle_int16_t *rectangle);
cairo_private cairo_status_t
_cairo_clip_intersect_to_region (cairo_clip_t *clip,
@ -117,7 +117,7 @@ _cairo_clip_combine_to_surface (cairo_clip_t *clip,
cairo_surface_t *dst,
int dst_x,
int dst_y,
const cairo_rectangle_fixed_t *extents);
const cairo_rectangle_int16_t *extents);
cairo_private void
_cairo_clip_translate (cairo_clip_t *clip,

6
src/cairo-clip.c
View file

@ -120,7 +120,7 @@ _cairo_clip_reset (cairo_clip_t *clip)
cairo_status_t
_cairo_clip_intersect_to_rectangle (cairo_clip_t *clip,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
if (!clip)
return CAIRO_STATUS_SUCCESS;
@ -206,7 +206,7 @@ _cairo_clip_combine_to_surface (cairo_clip_t *clip,
cairo_surface_t *dst,
int dst_x,
int dst_y,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_pattern_union_t pattern;
cairo_status_t status;
@ -336,7 +336,7 @@ _cairo_clip_intersect_mask (cairo_clip_t *clip,
{
cairo_pattern_union_t pattern;
cairo_box_t extents;
cairo_rectangle_fixed_t surface_rect, target_rect;
cairo_rectangle_int16_t surface_rect, target_rect;
cairo_surface_t *surface;
cairo_status_t status;

16
src/cairo-directfb-surface.c
View file

@ -231,9 +231,9 @@ static IDirectFBSurface *cairo_directfb_buffer_surface_create(IDirectFB *dfb,voi
static cairo_status_t
_cairo_directfb_surface_get_image (cairo_directfb_surface_t *surface,
cairo_rectangle_fixed_t *interest,
cairo_rectangle_int16_t *interest,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *rect_out,
cairo_rectangle_int16_t *rect_out,
DFBSurfaceLockFlags flags)
{
int pitch;
@ -389,9 +389,9 @@ _cairo_directfb_surface_release_source_image (void *abstract_surface,
static cairo_status_t
_cairo_directfb_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect_out,
cairo_rectangle_int16_t *image_rect_out,
void **image_extra)
{
cairo_directfb_surface_t *surface = abstract_surface;
@ -402,9 +402,9 @@ _cairo_directfb_surface_acquire_dest_image (void *abstract_su
static void
_cairo_directfb_surface_release_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
cairo_directfb_surface_t *surface = abstract_surface;
@ -515,7 +515,7 @@ static cairo_int_status_t
_cairo_directfb_surface_fill_rectangles (void *abstract_surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int n_rects)
{
int i,k;
@ -584,7 +584,7 @@ _cairo_directfb_surface_set_clip_region (void *abstract_surface,
static cairo_int_status_t
_cairo_directfb_abstract_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
if( rectangle ) {
cairo_directfb_surface_t *surface = abstract_surface;

16
src/cairo-glitz-surface.c
View file

@ -111,9 +111,9 @@ _cairo_glitz_surface_create_similar (void *abstract_src,
static cairo_status_t
_cairo_glitz_surface_get_image (cairo_glitz_surface_t *surface,
cairo_rectangle_fixed_t *interest,
cairo_rectangle_int16_t *interest,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *rect_out)
cairo_rectangle_int16_t *rect_out)
{
cairo_image_surface_t *image;
int x1, y1, x2, y2;
@ -318,9 +318,9 @@ _cairo_glitz_surface_release_source_image (void *abstract_surface,
static cairo_status_t
_cairo_glitz_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect_out,
cairo_rectangle_int16_t *image_rect_out,
void **image_extra)
{
cairo_glitz_surface_t *surface = abstract_surface;
@ -340,9 +340,9 @@ _cairo_glitz_surface_acquire_dest_image (void *abstract_surfa
static void
_cairo_glitz_surface_release_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
cairo_glitz_surface_t *surface = abstract_surface;
@ -920,7 +920,7 @@ static cairo_int_status_t
_cairo_glitz_surface_fill_rectangles (void *abstract_dst,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int n_rects)
{
cairo_glitz_surface_t *dst = abstract_dst;
@ -1256,7 +1256,7 @@ _cairo_glitz_surface_set_clip_region (void *abstract_surface,
static cairo_int_status_t
_cairo_glitz_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_glitz_surface_t *surface = abstract_surface;

12
src/cairo-image-surface.c
View file

@ -528,9 +528,9 @@ _cairo_image_surface_release_source_image (void *abstract_surf
static cairo_status_t
_cairo_image_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect_out,
cairo_rectangle_int16_t *image_rect_out,
void **image_extra)
{
cairo_image_surface_t *surface = abstract_surface;
@ -548,9 +548,9 @@ _cairo_image_surface_acquire_dest_image (void *abstract_surfa
static void
_cairo_image_surface_release_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
}
@ -777,7 +777,7 @@ static cairo_int_status_t
_cairo_image_surface_fill_rectangles (void *abstract_surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects)
{
cairo_image_surface_t *surface = abstract_surface;
@ -950,7 +950,7 @@ _cairo_image_surface_set_clip_region (void *abstract_surface,
static cairo_int_status_t
_cairo_image_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_image_surface_t *surface = abstract_surface;

2
src/cairo-meta-surface.c
View file

@ -547,7 +547,7 @@ _cairo_meta_surface_intersect_clip_path (void *dst,
*/
static cairo_int_status_t
_cairo_meta_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
rectangle->x = 0;
rectangle->y = 0;

6
src/cairo-paginated-surface.c
View file

@ -170,7 +170,7 @@ _cairo_paginated_surface_acquire_source_image (void *abstract_surface,
{
cairo_paginated_surface_t *surface = abstract_surface;
cairo_surface_t *image;
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
_cairo_surface_get_extents (surface->target, &extents);
@ -317,7 +317,7 @@ _cairo_paginated_surface_intersect_clip_path (void *abstract_surface,
static cairo_int_status_t
_cairo_paginated_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_paginated_surface_t *surface = abstract_surface;
@ -448,7 +448,7 @@ _cairo_paginated_surface_snapshot (void *abstract_other)
#if 0
return _cairo_surface_snapshot (other->meta);
#else
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
cairo_surface_t *surface;
_cairo_surface_get_extents (other->target, &extents);

4
src/cairo-pattern.c
View file

@ -1395,13 +1395,13 @@ _cairo_pattern_acquire_surfaces (cairo_pattern_t *src,
**/
cairo_status_t
_cairo_pattern_get_extents (cairo_pattern_t *pattern,
cairo_rectangle_fixed_t *extents)
cairo_rectangle_int16_t *extents)
{
if (pattern->extend == CAIRO_EXTEND_NONE &&
pattern->type == CAIRO_PATTERN_TYPE_SURFACE)
{
cairo_status_t status;
cairo_rectangle_fixed_t surface_extents;
cairo_rectangle_int16_t surface_extents;
cairo_surface_pattern_t *surface_pattern =
(cairo_surface_pattern_t *) pattern;
cairo_surface_t *surface = surface_pattern->surface;

4
src/cairo-pdf-surface.c
View file

@ -890,7 +890,7 @@ emit_surface_pattern (cairo_pdf_surface_t *surface,
cairo_matrix_t cairo_p2d, pdf_p2d;
cairo_extend_t extend = cairo_pattern_get_extend (&pattern->base);
int xstep, ystep;
cairo_rectangle_fixed_t surface_extents;
cairo_rectangle_int16_t surface_extents;
/* XXX: Should do something clever here for PDF source surfaces ? */
@ -1349,7 +1349,7 @@ _cairo_pdf_surface_show_page (void *abstract_surface)
static cairo_int_status_t
_cairo_pdf_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_pdf_surface_t *surface = abstract_surface;

4
src/cairo-ps-surface.c
View file

@ -1374,7 +1374,7 @@ static void
emit_surface_pattern (cairo_ps_surface_t *surface,
cairo_surface_pattern_t *pattern)
{
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
if (_cairo_surface_is_meta (pattern->surface)) {
_cairo_output_stream_printf (surface->stream, "/MyPattern {\n");
@ -1502,7 +1502,7 @@ _cairo_ps_surface_intersect_clip_path (void *abstract_surface,
static cairo_int_status_t
_cairo_ps_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_ps_surface_t *surface = abstract_surface;

2
src/cairo-quartz-private.h
View file

@ -46,7 +46,7 @@ typedef struct cairo_quartz_surface {
cairo_bool_t y_grows_down;
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
pixman_region16_t *clip_region;
} cairo_quartz_surface_t;

10
src/cairo-quartz-surface.c
View file

@ -64,9 +64,9 @@ _cairo_quartz_surface_acquire_source_image(void *abstract_surface,
static cairo_status_t
_cairo_quartz_surface_acquire_dest_image(void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void **image_extra)
{
cairo_quartz_surface_t *surface = abstract_surface;
@ -146,9 +146,9 @@ create_image_from_surface (cairo_image_surface_t *image_surface, void *data)
static void
_cairo_quartz_surface_release_dest_image(void *abstract_surface,
cairo_rectangle_fixed_t *intersect_rect,
cairo_rectangle_int16_t *intersect_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
cairo_quartz_surface_t *surface = abstract_surface;
@ -196,7 +196,7 @@ _cairo_quartz_surface_set_clip_region(void *abstract_surface,
static cairo_int_status_t
_cairo_quartz_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_quartz_surface_t *surface = abstract_surface;

10
src/cairo-rectangle.c
View file

@ -41,19 +41,19 @@
/* XXX We currently have a confusing mix of boxes and rectangles as
* exemplified by this function. A cairo_box_t is a rectangular area
* represented by the coordinates of the upper left and lower right
* corners, expressed in fixed point numbers. A cairo_rectangle_fixed_t is
* corners, expressed in fixed point numbers. A cairo_rectangle_int16_t is
* also a rectangular area, but represented by the upper left corner
* and the width and the height, as integer numbers.
*
* This function converts a cairo_box_t to a cairo_rectangle_fixed_t by
* This function converts a cairo_box_t to a cairo_rectangle_int16_t by
* increasing the area to the nearest integer coordinates. We should
* standardize on cairo_rectangle_fixed_t and cairo_rectangle_fixed_t, and
* standardize on cairo_rectangle_int16_t and cairo_rectangle_int16_t, and
* this function could be renamed to the more reasonable
* _cairo_rectangle_fixed_round.
*/
void
_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_fixed_t *rectangle)
_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_int16_t *rectangle)
{
rectangle->x = _cairo_fixed_integer_floor (box->p1.x);
rectangle->y = _cairo_fixed_integer_floor (box->p1.y);
@ -62,7 +62,7 @@ _cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_fixed_t *rectan
}
void
_cairo_rectangle_intersect (cairo_rectangle_fixed_t *dest, cairo_rectangle_fixed_t *src)
_cairo_rectangle_intersect (cairo_rectangle_int16_t *dest, cairo_rectangle_int16_t *src)
{
int x1, y1, x2, y2;

8
src/cairo-region.c
View file

@ -37,7 +37,7 @@
/**
* _cairo_region_create_from_rectangle:
* @rect: a #cairo_rectangle_fixed_t
* @rect: a #cairo_rectangle_int16_t
*
* Creates a region with extents initialized from the given
* rectangle.
@ -46,7 +46,7 @@
* memory couldn't a allocated.
**/
pixman_region16_t *
_cairo_region_create_from_rectangle (cairo_rectangle_fixed_t *rect)
_cairo_region_create_from_rectangle (cairo_rectangle_int16_t *rect)
{
/* We can't use pixman_region_create_simple(), because it doesn't
* have an error return
@ -67,11 +67,11 @@ _cairo_region_create_from_rectangle (cairo_rectangle_fixed_t *rect)
* @region: a #pixman_region16_t
* @rect: rectangle into which to store the extents
*
* Gets the bounding box of a region as a cairo_rectangle_fixed_t
* Gets the bounding box of a region as a cairo_rectangle_int16_t
**/
void
_cairo_region_extents_rectangle (pixman_region16_t *region,
cairo_rectangle_fixed_t *rect)
cairo_rectangle_int16_t *rect)
{
pixman_box16_t *region_extents = pixman_region_extents (region);

2
src/cairo-scaled-font.c
View file

@ -785,7 +785,7 @@ cairo_status_t
_cairo_scaled_font_glyph_device_extents (cairo_scaled_font_t *scaled_font,
const cairo_glyph_t *glyphs,
int num_glyphs,
cairo_rectangle_fixed_t *extents)
cairo_rectangle_int16_t *extents)
{
cairo_status_t status = CAIRO_STATUS_SUCCESS;
int i;

2
src/cairo-surface-fallback-private.h
View file

@ -99,7 +99,7 @@ cairo_private cairo_status_t
_cairo_surface_fallback_fill_rectangles (cairo_surface_t *surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects);
cairo_private cairo_status_t

42
src/cairo-surface-fallback.c
View file

@ -40,9 +40,9 @@
typedef struct {
cairo_surface_t *dst;
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
cairo_image_surface_t *image;
cairo_rectangle_fixed_t image_rect;
cairo_rectangle_int16_t image_rect;
void *image_extra;
} fallback_state_t;
@ -104,7 +104,7 @@ typedef cairo_status_t (*cairo_draw_func_t) (void *clos
cairo_surface_t *dst,
int dst_x,
int dst_y,
const cairo_rectangle_fixed_t *extents);
const cairo_rectangle_int16_t *extents);
static cairo_status_t
_create_composite_mask_pattern (cairo_surface_pattern_t *mask_pattern,
@ -112,7 +112,7 @@ _create_composite_mask_pattern (cairo_surface_pattern_t *mask_pattern,
cairo_draw_func_t draw_func,
void *draw_closure,
cairo_surface_t *dst,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_surface_t *mask;
cairo_status_t status;
@ -157,7 +157,7 @@ _clip_and_composite_with_mask (cairo_clip_t *clip,
cairo_draw_func_t draw_func,
void *draw_closure,
cairo_surface_t *dst,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_surface_pattern_t mask_pattern;
cairo_status_t status;
@ -191,7 +191,7 @@ _clip_and_composite_combine (cairo_clip_t *clip,
cairo_draw_func_t draw_func,
void *draw_closure,
cairo_surface_t *dst,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_surface_t *intermediate;
cairo_surface_pattern_t dst_pattern;
@ -279,7 +279,7 @@ _clip_and_composite_source (cairo_clip_t *clip,
cairo_draw_func_t draw_func,
void *draw_closure,
cairo_surface_t *dst,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_surface_pattern_t mask_pattern;
cairo_status_t status;
@ -320,7 +320,7 @@ _clip_and_composite_source (cairo_clip_t *clip,
}
static int
_cairo_rectangle_empty (const cairo_rectangle_fixed_t *rect)
_cairo_rectangle_empty (const cairo_rectangle_int16_t *rect)
{
return rect->width == 0 || rect->height == 0;
}
@ -353,7 +353,7 @@ _clip_and_composite (cairo_clip_t *clip,
cairo_draw_func_t draw_func,
void *draw_closure,
cairo_surface_t *dst,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_pattern_union_t solid_pattern;
cairo_status_t status;
@ -408,7 +408,7 @@ _composite_trap_region (cairo_clip_t *clip,
cairo_operator_t op,
cairo_surface_t *dst,
pixman_region16_t *trap_region,
cairo_rectangle_fixed_t *extents)
cairo_rectangle_int16_t *extents)
{
cairo_status_t status;
cairo_pattern_union_t solid_pattern;
@ -476,7 +476,7 @@ _composite_traps_draw_func (void *closure,
cairo_surface_t *dst,
int dst_x,
int dst_y,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_composite_traps_info_t *info = closure;
cairo_pattern_union_t pattern;
@ -513,7 +513,7 @@ _clip_and_composite_trapezoids (cairo_pattern_t *src,
cairo_status_t status;
pixman_region16_t *trap_region;
pixman_region16_t *clear_region = NULL;
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
cairo_composite_traps_info_t traps_info;
if (traps->num_traps == 0)
@ -656,7 +656,7 @@ _cairo_surface_fallback_paint (cairo_surface_t *surface,
cairo_pattern_t *source)
{
cairo_status_t status;
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
cairo_box_t box;
cairo_traps_t traps;
@ -665,7 +665,7 @@ _cairo_surface_fallback_paint (cairo_surface_t *surface,
return status;
if (_cairo_operator_bounded_by_source (op)) {
cairo_rectangle_fixed_t source_extents;
cairo_rectangle_int16_t source_extents;
status = _cairo_pattern_get_extents (source, &source_extents);
if (status)
return status;
@ -705,7 +705,7 @@ _cairo_surface_mask_draw_func (void *closure,
cairo_surface_t *dst,
int dst_x,
int dst_y,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_pattern_t *mask = closure;
@ -732,7 +732,7 @@ _cairo_surface_fallback_mask (cairo_surface_t *surface,
cairo_pattern_t *mask)
{
cairo_status_t status;
cairo_rectangle_fixed_t extents, source_extents, mask_extents;
cairo_rectangle_int16_t extents, source_extents, mask_extents;
status = _cairo_surface_get_extents (surface, &extents);
if (status)
@ -854,7 +854,7 @@ _cairo_surface_old_show_glyphs_draw_func (void *closure
cairo_surface_t *dst,
int dst_x,
int dst_y,
const cairo_rectangle_fixed_t *extents)
const cairo_rectangle_int16_t *extents)
{
cairo_show_glyphs_info_t *glyph_info = closure;
cairo_pattern_union_t pattern;
@ -916,7 +916,7 @@ _cairo_surface_fallback_show_glyphs (cairo_surface_t *surface,
cairo_scaled_font_t *scaled_font)
{
cairo_status_t status;
cairo_rectangle_fixed_t extents, glyph_extents;
cairo_rectangle_int16_t extents, glyph_extents;
cairo_show_glyphs_info_t glyph_info;
status = _cairo_surface_get_extents (surface, &extents);
@ -1042,11 +1042,11 @@ cairo_status_t
_cairo_surface_fallback_fill_rectangles (cairo_surface_t *surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects)
{
fallback_state_t state;
cairo_rectangle_fixed_t *offset_rects = NULL;
cairo_rectangle_int16_t *offset_rects = NULL;
cairo_status_t status;
int x1, y1, x2, y2;
int i;
@ -1086,7 +1086,7 @@ _cairo_surface_fallback_fill_rectangles (cairo_surface_t *surface,
/* If the fetched image isn't at 0,0, we need to offset the rectangles */
if (state.image_rect.x != 0 || state.image_rect.y != 0) {
offset_rects = malloc (sizeof (cairo_rectangle_fixed_t) * num_rects);
offset_rects = malloc (sizeof (cairo_rectangle_int16_t) * num_rects);
if (offset_rects == NULL) {
status = CAIRO_STATUS_NO_MEMORY;
goto DONE;

36
src/cairo-surface.c
View file

@ -737,9 +737,9 @@ _cairo_surface_release_source_image (cairo_surface_t *surface,
**/
cairo_status_t
_cairo_surface_acquire_dest_image (cairo_surface_t *surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void **image_extra)
{
assert (!surface->finished);
@ -763,9 +763,9 @@ _cairo_surface_acquire_dest_image (cairo_surface_t *surface,
**/
void
_cairo_surface_release_dest_image (cairo_surface_t *surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
assert (!surface->finished);
@ -938,7 +938,7 @@ _cairo_surface_fill_rectangle (cairo_surface_t *surface,
int width,
int height)
{
cairo_rectangle_fixed_t rect;
cairo_rectangle_int16_t rect;
assert (! surface->is_snapshot);
@ -977,7 +977,7 @@ _cairo_surface_fill_region (cairo_surface_t *surface,
{
int num_rects = pixman_region_num_rects (region);
pixman_box16_t *boxes = pixman_region_rects (region);
cairo_rectangle_fixed_t *rects;
cairo_rectangle_int16_t *rects;
cairo_status_t status;
int i;
@ -1025,7 +1025,7 @@ cairo_status_t
_cairo_surface_fill_rectangles (cairo_surface_t *surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects)
{
cairo_int_status_t status;
@ -1553,7 +1553,7 @@ _cairo_surface_set_clip (cairo_surface_t *surface, cairo_clip_t *clip)
cairo_status_t
_cairo_surface_get_extents (cairo_surface_t *surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_status_t status;
@ -1670,15 +1670,15 @@ _cairo_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
static cairo_status_t
_cairo_surface_composite_fixup_unbounded_internal (cairo_surface_t *dst,
cairo_rectangle_fixed_t *src_rectangle,
cairo_rectangle_fixed_t *mask_rectangle,
cairo_rectangle_int16_t *src_rectangle,
cairo_rectangle_int16_t *mask_rectangle,
int dst_x,
int dst_y,
unsigned int width,
unsigned int height)
{
cairo_rectangle_fixed_t dst_rectangle;
cairo_rectangle_fixed_t drawn_rectangle;
cairo_rectangle_int16_t dst_rectangle;
cairo_rectangle_int16_t drawn_rectangle;
pixman_region16_t *drawn_region;
pixman_region16_t *clear_region;
cairo_status_t status = CAIRO_STATUS_SUCCESS;
@ -1767,9 +1767,9 @@ _cairo_surface_composite_fixup_unbounded (cairo_surface_t *dst,
unsigned int width,
unsigned int height)
{
cairo_rectangle_fixed_t src_tmp, mask_tmp;
cairo_rectangle_fixed_t *src_rectangle = NULL;
cairo_rectangle_fixed_t *mask_rectangle = NULL;
cairo_rectangle_int16_t src_tmp, mask_tmp;
cairo_rectangle_int16_t *src_rectangle = NULL;
cairo_rectangle_int16_t *mask_rectangle = NULL;
assert (! dst->is_snapshot);
@ -1842,9 +1842,9 @@ _cairo_surface_composite_shape_fixup_unbounded (cairo_surface_t *dst,
unsigned int width,
unsigned int height)
{
cairo_rectangle_fixed_t src_tmp, mask_tmp;
cairo_rectangle_fixed_t *src_rectangle = NULL;
cairo_rectangle_fixed_t *mask_rectangle = NULL;
cairo_rectangle_int16_t src_tmp, mask_tmp;
cairo_rectangle_int16_t *src_rectangle = NULL;
cairo_rectangle_int16_t *mask_rectangle = NULL;
assert (! dst->is_snapshot);

2
src/cairo-svg-surface.c
View file

@ -1378,7 +1378,7 @@ _cairo_svg_surface_fill (void *abstract_surface,
static cairo_int_status_t
_cairo_svg_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_svg_surface_t *surface = abstract_surface;

4
src/cairo-win32-private.h
View file

@ -69,11 +69,11 @@ typedef struct _cairo_win32_surface {
cairo_surface_t *image;
cairo_rectangle_fixed_t clip_rect;
cairo_rectangle_int16_t clip_rect;
HRGN saved_clip;
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
} cairo_win32_surface_t;
cairo_status_t

12
src/cairo-win32-surface.c
View file

@ -448,9 +448,9 @@ _cairo_win32_surface_release_source_image (void *abstract_surf
static cairo_status_t
_cairo_win32_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void **image_extra)
{
cairo_win32_surface_t *surface = abstract_surface;
@ -516,9 +516,9 @@ _cairo_win32_surface_acquire_dest_image (void *abstract_surfa
static void
_cairo_win32_surface_release_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
cairo_win32_surface_t *surface = abstract_surface;
@ -811,7 +811,7 @@ static cairo_int_status_t
_cairo_win32_surface_fill_rectangles (void *abstract_surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects)
{
cairo_win32_surface_t *surface = abstract_surface;
@ -964,7 +964,7 @@ _cairo_win32_surface_set_clip_region (void *abstract_surface,
static cairo_int_status_t
_cairo_win32_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_win32_surface_t *surface = abstract_surface;

18
src/cairo-xcb-surface.c
View file

@ -378,9 +378,9 @@ _CAIRO_MASK_FORMAT (cairo_format_masks_t *masks, cairo_format_t *format)
static cairo_status_t
_get_image_surface (cairo_xcb_surface_t *surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect)
cairo_rectangle_int16_t *image_rect)
{
cairo_image_surface_t *image;
XCBGetImageRep *imagerep;
@ -396,7 +396,7 @@ _get_image_surface (cairo_xcb_surface_t *surface,
y2 = surface->height;
if (interest_rect) {
cairo_rectangle_fixed_t rect;
cairo_rectangle_int16_t rect;
rect.x = interest_rect->x;
rect.y = interest_rect->y;
@ -623,9 +623,9 @@ _cairo_xcb_surface_release_source_image (void *abstract_surfac
static cairo_status_t
_cairo_xcb_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect_out,
cairo_rectangle_int16_t *image_rect_out,
void **image_extra)
{
cairo_xcb_surface_t *surface = abstract_surface;
@ -644,9 +644,9 @@ _cairo_xcb_surface_acquire_dest_image (void *abstract_surface
static void
_cairo_xcb_surface_release_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
cairo_xcb_surface_t *surface = abstract_surface;
@ -943,7 +943,7 @@ static cairo_int_status_t
_cairo_xcb_surface_fill_rectangles (void *abstract_surface,
cairo_operator_t op,
const cairo_color_t * color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects)
{
cairo_xcb_surface_t *surface = abstract_surface;
@ -1037,7 +1037,7 @@ _cairo_xcb_surface_composite_trapezoids (cairo_operator_t op,
static cairo_int_status_t
_cairo_xcb_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_xcb_surface_t *surface = abstract_surface;

20
src/cairo-xlib-surface.c
View file

@ -503,9 +503,9 @@ _swap_ximage_to_native (XImage *ximage)
static cairo_status_t
_get_image_surface (cairo_xlib_surface_t *surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect)
cairo_rectangle_int16_t *image_rect)
{
cairo_image_surface_t *image;
XImage *ximage;
@ -519,7 +519,7 @@ _get_image_surface (cairo_xlib_surface_t *surface,
y2 = surface->height;
if (interest_rect) {
cairo_rectangle_fixed_t rect;
cairo_rectangle_int16_t rect;
rect.x = interest_rect->x;
rect.y = interest_rect->y;
@ -809,9 +809,9 @@ _cairo_xlib_surface_release_source_image (void *abstract_surfa
static cairo_status_t
_cairo_xlib_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect_out,
cairo_rectangle_int16_t *image_rect_out,
void **image_extra)
{
cairo_xlib_surface_t *surface = abstract_surface;
@ -830,9 +830,9 @@ _cairo_xlib_surface_acquire_dest_image (void *abstract_surfac
static void
_cairo_xlib_surface_release_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
cairo_xlib_surface_t *surface = abstract_surface;
@ -1400,7 +1400,7 @@ static cairo_int_status_t
_cairo_xlib_surface_fill_rectangles (void *abstract_surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects)
{
cairo_xlib_surface_t *surface = abstract_surface;
@ -1701,7 +1701,7 @@ _cairo_xlib_surface_set_clip_region (void *abstract_surface,
static cairo_int_status_t
_cairo_xlib_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
cairo_xlib_surface_t *surface = abstract_surface;
@ -2644,7 +2644,7 @@ _cairo_xlib_surface_show_glyphs (void *abstract_dst,
(cairo_surface_t **) &src,
&attributes);
} else {
cairo_rectangle_fixed_t glyph_extents;
cairo_rectangle_int16_t glyph_extents;
status = _cairo_scaled_font_glyph_device_extents (scaled_font,
glyphs,

2
src/cairo.c
View file

@ -400,7 +400,7 @@ void
cairo_push_group_with_content (cairo_t *cr, cairo_content_t content)
{
cairo_status_t status;
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
cairo_surface_t *group_surface = NULL;
/* Get the extents that we'll use in creating our new group surface */

44
src/cairoint.h
View file

@ -243,10 +243,10 @@ typedef struct _cairo_trapezoid {
cairo_line_t left, right;
} cairo_trapezoid_t;
typedef struct _cairo_rectangle {
short x, y;
unsigned short width, height;
} cairo_rectangle_fixed_t, cairo_glyph_size_t;
typedef struct _cairo_rectangle_int16 {
int16_t x, y;
uint16_t width, height;
} cairo_rectangle_int16_t, cairo_glyph_size_t;
/* Sure wish C had a real enum type so that this would be distinct
from cairo_status_t. Oh well, without that, I'll use this bogus 1000
@ -332,10 +332,10 @@ typedef struct _cairo_image_surface cairo_image_surface_t;
typedef struct _cairo_surface_backend cairo_surface_backend_t;
cairo_private void
_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_fixed_t *rectangle);
_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_int16_t *rectangle);
cairo_private void
_cairo_rectangle_intersect (cairo_rectangle_fixed_t *dest, cairo_rectangle_fixed_t *src);
_cairo_rectangle_intersect (cairo_rectangle_int16_t *dest, cairo_rectangle_int16_t *src);
/* cairo_array.c structures and functions */
@ -637,16 +637,16 @@ struct _cairo_surface_backend {
cairo_status_t
(*acquire_dest_image) (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void **image_extra);
void
(*release_dest_image) (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra);
cairo_status_t
@ -673,7 +673,7 @@ struct _cairo_surface_backend {
(*fill_rectangles) (void *surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects);
/* XXX: dst should be the first argument for consistency */
@ -747,7 +747,7 @@ struct _cairo_surface_backend {
*/
cairo_int_status_t
(*get_extents) (void *surface,
cairo_rectangle_fixed_t *rectangle);
cairo_rectangle_int16_t *rectangle);
/*
* This is an optional entry to let the surface manage its own glyph
@ -1561,7 +1561,7 @@ cairo_private cairo_status_t
_cairo_scaled_font_glyph_device_extents (cairo_scaled_font_t *scaled_font,
const cairo_glyph_t *glyphs,
int num_glyphs,
cairo_rectangle_fixed_t *extents);
cairo_rectangle_int16_t *extents);
cairo_private cairo_status_t
_cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font,
@ -1683,7 +1683,7 @@ cairo_private cairo_status_t
_cairo_surface_fill_rectangles (cairo_surface_t *surface,
cairo_operator_t op,
const cairo_color_t *color,
cairo_rectangle_fixed_t *rects,
cairo_rectangle_int16_t *rects,
int num_rects);
cairo_private cairo_status_t
@ -1757,16 +1757,16 @@ _cairo_surface_release_source_image (cairo_surface_t *surface,
cairo_private cairo_status_t
_cairo_surface_acquire_dest_image (cairo_surface_t *surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void **image_extra);
cairo_private void
_cairo_surface_release_dest_image (cairo_surface_t *surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra);
cairo_private cairo_status_t
@ -1803,7 +1803,7 @@ _cairo_surface_set_clip (cairo_surface_t *surface, cairo_clip_t *clip);
cairo_private cairo_status_t
_cairo_surface_get_extents (cairo_surface_t *surface,
cairo_rectangle_fixed_t *rectangle);
cairo_rectangle_int16_t *rectangle);
cairo_private cairo_status_t
_cairo_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font,
@ -2151,7 +2151,7 @@ _cairo_pattern_acquire_surfaces (cairo_pattern_t *src,
cairo_private cairo_status_t
_cairo_pattern_get_extents (cairo_pattern_t *pattern,
cairo_rectangle_fixed_t *extents);
cairo_rectangle_int16_t *extents);
cairo_private cairo_status_t
_cairo_gstate_set_antialias (cairo_gstate_t *gstate,
@ -2163,11 +2163,11 @@ _cairo_gstate_get_antialias (cairo_gstate_t *gstate);
/* cairo-region.c */
cairo_private pixman_region16_t *
_cairo_region_create_from_rectangle (cairo_rectangle_fixed_t *rect);
_cairo_region_create_from_rectangle (cairo_rectangle_int16_t *rect);
cairo_private void
_cairo_region_extents_rectangle (pixman_region16_t *region,
cairo_rectangle_fixed_t *rect);
cairo_rectangle_int16_t *rect);
/* cairo_unicode.c */

10
src/test-fallback-surface.c
View file

@ -136,9 +136,9 @@ _test_fallback_surface_release_source_image (void *abstract_surface,
static cairo_status_t
_test_fallback_surface_acquire_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t **image_out,
cairo_rectangle_fixed_t *image_rect_out,
cairo_rectangle_int16_t *image_rect_out,
void **image_extra)
{
test_fallback_surface_t *surface = abstract_surface;
@ -152,9 +152,9 @@ _test_fallback_surface_acquire_dest_image (void *abstract_surface,
static void
_test_fallback_surface_release_dest_image (void *abstract_surface,
cairo_rectangle_fixed_t *interest_rect,
cairo_rectangle_int16_t *interest_rect,
cairo_image_surface_t *image,
cairo_rectangle_fixed_t *image_rect,
cairo_rectangle_int16_t *image_rect,
void *image_extra)
{
test_fallback_surface_t *surface = abstract_surface;
@ -168,7 +168,7 @@ _test_fallback_surface_release_dest_image (void *abstract_surface,
static cairo_int_status_t
_test_fallback_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
test_fallback_surface_t *surface = abstract_surface;

4
src/test-meta-surface.c
View file

@ -170,7 +170,7 @@ _test_meta_surface_intersect_clip_path (void *abstract_surface,
static cairo_int_status_t
_test_meta_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
test_meta_surface_t *surface = abstract_surface;
@ -280,7 +280,7 @@ _test_meta_surface_snapshot (void *abstract_other)
#if 0
return _cairo_surface_snapshot (other->meta);
#else
cairo_rectangle_fixed_t extents;
cairo_rectangle_int16_t extents;
cairo_surface_t *surface;
_cairo_surface_get_extents (other->image, &extents);

2
src/test-paginated-surface.c
View file

@ -139,7 +139,7 @@ _test_paginated_surface_set_clip_region (void *abstract_surface,
static cairo_int_status_t
_test_paginated_surface_get_extents (void *abstract_surface,
cairo_rectangle_fixed_t *rectangle)
cairo_rectangle_int16_t *rectangle)
{
test_paginated_surface_t *surface = abstract_surface;