diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c index 26a373fa6..ff7e7d8a8 100644 --- a/src/cairo-analysis-surface.c +++ b/src/cairo-analysis-surface.c @@ -49,7 +49,7 @@ typedef struct { static cairo_int_status_t _cairo_analysis_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_analysis_surface_t *surface = abstract_surface; diff --git a/src/cairo-clip-private.h b/src/cairo-clip-private.h index e7190cf1d..fa3942325 100644 --- a/src/cairo-clip-private.h +++ b/src/cairo-clip-private.h @@ -63,7 +63,7 @@ struct _cairo_clip { * clip paths */ cairo_surface_t *surface; - cairo_rectangle_int16_t surface_rect; + cairo_rectangle_int_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_int16_t *rectangle); + cairo_rectangle_int_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_int16_t *extents); + const cairo_rectangle_int_t *extents); cairo_private void _cairo_clip_translate (cairo_clip_t *clip, diff --git a/src/cairo-clip.c b/src/cairo-clip.c index abc50334d..e670456e5 100644 --- a/src/cairo-clip.c +++ b/src/cairo-clip.c @@ -120,13 +120,13 @@ _cairo_clip_reset (cairo_clip_t *clip) static cairo_status_t _cairo_clip_path_intersect_to_rectangle (cairo_clip_path_t *clip_path, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { while (clip_path) { cairo_status_t status; cairo_traps_t traps; cairo_box_t extents; - cairo_rectangle_int16_t extents_rect; + cairo_rectangle_int_t extents_rect; _cairo_traps_init (&traps); @@ -153,7 +153,7 @@ _cairo_clip_path_intersect_to_rectangle (cairo_clip_path_t *clip_path, cairo_status_t _cairo_clip_intersect_to_rectangle (cairo_clip_t *clip, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { if (!clip) return CAIRO_STATUS_SUCCESS; @@ -240,7 +240,7 @@ _cairo_clip_combine_to_surface (cairo_clip_t *clip, cairo_surface_t *dst, int dst_x, int dst_y, - const cairo_rectangle_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_pattern_union_t pattern; cairo_status_t status; @@ -372,7 +372,7 @@ _cairo_clip_intersect_mask (cairo_clip_t *clip, { cairo_pattern_union_t pattern; cairo_box_t extents; - cairo_rectangle_int16_t surface_rect, target_rect; + cairo_rectangle_int_t surface_rect, target_rect; cairo_surface_t *surface; cairo_status_t status; @@ -648,7 +648,7 @@ _cairo_clip_copy_rectangle_list (cairo_clip_t *clip, cairo_gstate_t *gstate) } } } else { - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; if (_cairo_surface_get_extents (_cairo_gstate_get_target (gstate), &extents) != CAIRO_STATUS_SUCCESS) { free (rectangles); diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c index 5505501b7..d6f827c49 100644 --- a/src/cairo-directfb-surface.c +++ b/src/cairo-directfb-surface.c @@ -320,9 +320,9 @@ _directfb_buffer_surface_create (IDirectFB *dfb, static cairo_status_t _directfb_acquire_surface (cairo_directfb_surface_t *surface, - cairo_rectangle_int16_t *intrest_rec, + cairo_rectangle_int_t *intrest_rec, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect_out, + cairo_rectangle_int_t *image_rect_out, void **image_extra, DFBSurfaceLockFlags lock_flags) { @@ -499,9 +499,9 @@ _cairo_directfb_surface_release_source_image (void *abstract_su static cairo_status_t _cairo_directfb_surface_acquire_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect_out, + cairo_rectangle_int_t *image_rect_out, void **image_extra) { cairo_directfb_surface_t *surface = abstract_surface; @@ -515,9 +515,9 @@ _cairo_directfb_surface_acquire_dest_image (void *abstract_sur static void _cairo_directfb_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { cairo_directfb_surface_t *surface = abstract_surface; @@ -911,7 +911,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_int16_t *rects, + cairo_rectangle_int_t *rects, int n_rects) { cairo_directfb_surface_t *dst = abstract_surface; @@ -1142,7 +1142,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_directfb_surface_t *surface = abstract_surface; diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c index 51ba56bf7..72754ad3b 100644 --- a/src/cairo-glitz-surface.c +++ b/src/cairo-glitz-surface.c @@ -152,9 +152,9 @@ _CAIRO_MASK_FORMAT (cairo_format_masks_t *masks, cairo_format_t *format) static cairo_status_t _cairo_glitz_surface_get_image (cairo_glitz_surface_t *surface, - cairo_rectangle_int16_t *interest, + cairo_rectangle_int_t *interest, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *rect_out) + cairo_rectangle_int_t *rect_out) { cairo_image_surface_t *image; int x1, y1, x2, y2; @@ -426,9 +426,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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect_out, + cairo_rectangle_int_t *image_rect_out, void **image_extra) { cairo_glitz_surface_t *surface = abstract_surface; @@ -448,9 +448,9 @@ _cairo_glitz_surface_acquire_dest_image (void *abstract_surfa static void _cairo_glitz_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { cairo_glitz_surface_t *surface = abstract_surface; @@ -487,8 +487,8 @@ _cairo_glitz_surface_clone_similar (void *abstract_surface, { cairo_image_surface_t *image_src = (cairo_image_surface_t *) src; cairo_content_t content; - cairo_rectangle_int16_t image_extent; - cairo_rectangle_int16_t extent; + cairo_rectangle_int_t image_extent; + cairo_rectangle_int_t extent; content = _cairo_content_from_format (image_src->format); @@ -1073,7 +1073,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_int16_t *rects, + cairo_rectangle_int_t *rects, int n_rects) { cairo_glitz_surface_t *dst = abstract_dst; @@ -1433,7 +1433,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_glitz_surface_t *surface = abstract_surface; diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index 901fa586f..cda40b1dc 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -1214,7 +1214,7 @@ _cairo_gstate_clip_extents (cairo_gstate_t *gstate, double *x2, double *y2) { - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_status_t status; status = _cairo_surface_get_extents (gstate->target, &extents); diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index e3178ffeb..4959c3355 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -565,9 +565,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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect_out, + cairo_rectangle_int_t *image_rect_out, void **image_extra) { cairo_image_surface_t *surface = abstract_surface; @@ -585,9 +585,9 @@ _cairo_image_surface_acquire_dest_image (void *abstract_surfa static void _cairo_image_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { } @@ -825,7 +825,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_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects) { cairo_image_surface_t *surface = abstract_surface; @@ -992,7 +992,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_image_surface_t *surface = abstract_surface; diff --git a/src/cairo-meta-surface.c b/src/cairo-meta-surface.c index 30a64e723..9997baf9e 100644 --- a/src/cairo-meta-surface.c +++ b/src/cairo-meta-surface.c @@ -556,7 +556,7 @@ _cairo_meta_surface_intersect_clip_path (void *dst, */ static cairo_int_status_t _cairo_meta_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_meta_surface_t *surface = abstract_surface; diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c index 1535de4de..b4488874b 100644 --- a/src/cairo-os2-surface.c +++ b/src/cairo-os2-surface.c @@ -517,9 +517,9 @@ _cairo_os2_surface_release_source_image (void *abstract_surface static cairo_status_t _cairo_os2_surface_acquire_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void **image_extra) { cairo_os2_surface_t *local_os2_surface; @@ -552,9 +552,9 @@ _cairo_os2_surface_acquire_dest_image (void *abstract_surfac static void _cairo_os2_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { cairo_os2_surface_t *local_os2_surface; @@ -628,7 +628,7 @@ _cairo_os2_surface_release_dest_image (void *abstract_surface static cairo_int_status_t _cairo_os2_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_os2_surface_t *local_os2_surface; diff --git a/src/cairo-paginated-surface.c b/src/cairo-paginated-surface.c index 17470949e..00a1ef225 100644 --- a/src/cairo-paginated-surface.c +++ b/src/cairo-paginated-surface.c @@ -178,7 +178,7 @@ _cairo_paginated_surface_acquire_source_image (void *abstract_surface, cairo_paginated_surface_t *surface = abstract_surface; cairo_surface_t *image; cairo_status_t status; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; status = _cairo_surface_get_extents (surface->target, &extents); if (status) @@ -354,7 +354,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_paginated_surface_t *surface = abstract_surface; @@ -501,7 +501,7 @@ _cairo_paginated_surface_snapshot (void *abstract_other) #if 0 return _cairo_surface_snapshot (other->meta); #else - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_surface_t *surface; status = _cairo_surface_get_extents (other->target, &extents); diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c index 782173b1f..00c427e89 100644 --- a/src/cairo-pattern.c +++ b/src/cairo-pattern.c @@ -1512,7 +1512,7 @@ _cairo_pattern_acquire_surface_for_surface (cairo_surface_pattern_t *pattern, cairo_t *cr; int w,h; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; status = _cairo_surface_get_extents (pattern->surface, &extents); if (status) return status; @@ -1585,7 +1585,7 @@ _cairo_pattern_acquire_surface_for_surface (cairo_surface_pattern_t *pattern, } else { - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; status = _cairo_surface_get_extents (pattern->surface, &extents); if (status) return status; @@ -1914,13 +1914,13 @@ CLEANUP_SOURCE: **/ cairo_status_t _cairo_pattern_get_extents (cairo_pattern_t *pattern, - cairo_rectangle_int16_t *extents) + cairo_rectangle_int_t *extents) { if (pattern->extend == CAIRO_EXTEND_NONE && pattern->type == CAIRO_PATTERN_TYPE_SURFACE) { cairo_status_t status; - cairo_rectangle_int16_t surface_extents; + cairo_rectangle_int_t surface_extents; cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) pattern; cairo_surface_t *surface = surface_pattern->surface; @@ -1948,9 +1948,9 @@ _cairo_pattern_get_extents (cairo_pattern_t *pattern, y = surface_extents.y + sy * surface_extents.height; cairo_matrix_transform_point (&imatrix, &x, &y); if (x < 0) x = 0; - if (x > INT16_MAX) x = INT16_MAX; + if (x > CAIRO_RECT_INT_MAX) x = CAIRO_RECT_INT_MAX; if (y < 0) y = 0; - if (y > INT16_MAX) y = INT16_MAX; + if (y > CAIRO_RECT_INT_MAX) y = CAIRO_RECT_INT_MAX; lx = floor (x); rx = ceil (x); ty = floor (y); by = ceil (y); if (!set) { diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c index 3cb508100..9fdb0ca7a 100644 --- a/src/cairo-pdf-surface.c +++ b/src/cairo-pdf-surface.c @@ -910,7 +910,7 @@ _cairo_pdf_surface_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); double xstep, ystep; - cairo_rectangle_int16_t surface_extents; + cairo_rectangle_int_t surface_extents; /* XXX: Should do something clever here for PDF source surfaces ? */ @@ -1744,7 +1744,7 @@ _cairo_pdf_surface_show_page (void *abstract_surface) static cairo_int_status_t _cairo_pdf_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_pdf_surface_t *surface = abstract_surface; diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c index ba16c8a5d..7db9d0a5d 100644 --- a/src/cairo-ps-surface.c +++ b/src/cairo-ps-surface.c @@ -1878,7 +1878,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_ps_surface_t *surface = abstract_surface; @@ -1913,7 +1913,7 @@ _cairo_ps_surface_paint (void *abstract_surface, { cairo_ps_surface_t *surface = abstract_surface; cairo_output_stream_t *stream = surface->stream; - cairo_rectangle_int16_t extents, pattern_extents; + cairo_rectangle_int_t extents, pattern_extents; cairo_status_t status; if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) diff --git a/src/cairo-quartz-private.h b/src/cairo-quartz-private.h index cd1b15cd9..9f42a8b3c 100644 --- a/src/cairo-quartz-private.h +++ b/src/cairo-quartz-private.h @@ -51,7 +51,7 @@ typedef struct cairo_quartz_surface { CGContextRef cgContext; CGAffineTransform cgContextBaseCTM; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; /* These are stored while drawing operations are in place, set up * by quartz_setup_source() and quartz_finish_source() diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c index c65b29940..540bdca76 100644 --- a/src/cairo-quartz-surface.c +++ b/src/cairo-quartz-surface.c @@ -436,7 +436,7 @@ _cairo_quartz_surface_to_quartz (cairo_surface_t *target, cairo_surface_t *pat_s cairo_surface_t *ref_type = target; cairo_surface_t *new_surf = NULL; - cairo_rectangle_int16_t rect; + cairo_rectangle_int_t rect; if (ref_type == NULL) ref_type = cairo_quartz_surface_create (CAIRO_FORMAT_ARGB32, 1, 1); @@ -545,7 +545,7 @@ _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (cairo_quartz_surface_t { cairo_surface_pattern_t *spat; cairo_surface_t *pat_surf; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; CGRect pbounds; CGAffineTransform ptransform, stransform; @@ -675,7 +675,7 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface, cairo_quartz_surface_t *quartz_surf = _cairo_quartz_surface_to_quartz ((cairo_surface_t *) surface, pat_surf); CGImageRef img = CGBitmapContextCreateImage (quartz_surf->cgContext); cairo_matrix_t m = spat->base.matrix; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; if (!img) return DO_UNSUPPORTED; @@ -896,10 +896,10 @@ _cairo_quartz_surface_release_source_image (void *abstract_surface, static cairo_status_t _cairo_quartz_surface_acquire_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, - cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect, - void **image_extra) + cairo_rectangle_int_t *interest_rect, + cairo_image_surface_t **image_out, + cairo_rectangle_int_t *image_rect, + void **image_extra) { cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface; cairo_int_status_t status; @@ -920,10 +920,10 @@ _cairo_quartz_surface_acquire_dest_image (void *abstract_surface, static void _cairo_quartz_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, - cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, - void *image_extra) + cairo_rectangle_int_t *interest_rect, + cairo_image_surface_t *image, + cairo_rectangle_int_t *image_rect, + void *image_extra) { cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface; unsigned char *imageData = (unsigned char *) image_extra; @@ -1080,7 +1080,7 @@ _cairo_quartz_surface_clone_similar (void *abstract_surface, static cairo_int_status_t _cairo_quartz_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *extents) + cairo_rectangle_int_t *extents) { cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface; diff --git a/src/cairo-rectangle.c b/src/cairo-rectangle.c index fca4e426c..bda822460 100644 --- a/src/cairo-rectangle.c +++ b/src/cairo-rectangle.c @@ -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_int16_t is + * corners, expressed in fixed point numbers. A cairo_rectangle_int_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_int16_t by + * This function converts a cairo_box_t to a cairo_rectangle_int_t by * increasing the area to the nearest integer coordinates. We should - * standardize on cairo_rectangle_int16_t and cairo_rectangle_int16_t, and + * standardize on cairo_rectangle_fixed_t and cairo_rectangle_int_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_int16_t *rectangle) +_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_int_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_int16_t *rectan } void -_cairo_rectangle_intersect (cairo_rectangle_int16_t *dest, cairo_rectangle_int16_t *src) +_cairo_rectangle_intersect (cairo_rectangle_int_t *dest, cairo_rectangle_int_t *src) { int x1, y1, x2, y2; diff --git a/src/cairo-region.c b/src/cairo-region.c index c675a1895..4538e1c3f 100644 --- a/src/cairo-region.c +++ b/src/cairo-region.c @@ -44,7 +44,7 @@ **/ void _cairo_region_extents_rectangle (pixman_region16_t *region, - cairo_rectangle_int16_t *rect) + cairo_rectangle_int_t *rect) { pixman_box16_t *region_extents = pixman_region_extents (region); diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index ef70a389b..c9aa1c0ed 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -970,7 +970,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_int16_t *extents) + cairo_rectangle_int_t *extents) { cairo_status_t status = CAIRO_STATUS_SUCCESS; int i; diff --git a/src/cairo-surface-fallback-private.h b/src/cairo-surface-fallback-private.h index e0f83c403..13d92d00a 100644 --- a/src/cairo-surface-fallback-private.h +++ b/src/cairo-surface-fallback-private.h @@ -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_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects); cairo_private cairo_status_t diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c index 039780983..93b1b61c7 100644 --- a/src/cairo-surface-fallback.c +++ b/src/cairo-surface-fallback.c @@ -42,9 +42,9 @@ typedef struct { cairo_surface_t *dst; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_image_surface_t *image; - cairo_rectangle_int16_t image_rect; + cairo_rectangle_int_t image_rect; void *image_extra; } fallback_state_t; @@ -106,7 +106,7 @@ typedef cairo_status_t (*cairo_draw_func_t) (void *clos cairo_surface_t *dst, int dst_x, int dst_y, - const cairo_rectangle_int16_t *extents); + const cairo_rectangle_int_t *extents); static cairo_status_t _create_composite_mask_pattern (cairo_surface_pattern_t *mask_pattern, @@ -114,7 +114,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_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_surface_t *mask; cairo_status_t status; @@ -159,7 +159,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_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_surface_pattern_t mask_pattern; cairo_status_t status; @@ -193,7 +193,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_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_surface_t *intermediate; cairo_surface_pattern_t dst_pattern; @@ -281,7 +281,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_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_surface_pattern_t mask_pattern; cairo_status_t status; @@ -322,7 +322,7 @@ _clip_and_composite_source (cairo_clip_t *clip, } static int -_cairo_rectangle_empty (const cairo_rectangle_int16_t *rect) +_cairo_rectangle_empty (const cairo_rectangle_int_t *rect) { return rect->width == 0 || rect->height == 0; } @@ -355,7 +355,7 @@ _clip_and_composite (cairo_clip_t *clip, cairo_draw_func_t draw_func, void *draw_closure, cairo_surface_t *dst, - const cairo_rectangle_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_pattern_union_t solid_pattern; cairo_status_t status; @@ -411,7 +411,7 @@ _composite_trap_region (cairo_clip_t *clip, cairo_operator_t op, cairo_surface_t *dst, pixman_region16_t *trap_region, - cairo_rectangle_int16_t *extents) + cairo_rectangle_int_t *extents) { cairo_status_t status; cairo_pattern_union_t solid_pattern; @@ -483,7 +483,7 @@ _composite_traps_draw_func (void *closure, cairo_surface_t *dst, int dst_x, int dst_y, - const cairo_rectangle_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_composite_traps_info_t *info = closure; cairo_pattern_union_t pattern; @@ -523,7 +523,7 @@ _clip_and_composite_trapezoids (cairo_pattern_t *src, pixman_region16_t clear_region; cairo_bool_t has_trap_region = FALSE; cairo_bool_t has_clear_region = FALSE; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_composite_traps_info_t traps_info; if (traps->num_traps == 0) @@ -545,7 +545,7 @@ _clip_and_composite_trapezoids (cairo_pattern_t *src, } if (_cairo_operator_bounded_by_mask (op)) { - cairo_rectangle_int16_t trap_extents; + cairo_rectangle_int_t trap_extents; if (has_trap_region) { status = _cairo_clip_intersect_to_region (clip, &trap_region); @@ -678,7 +678,7 @@ _cairo_surface_fallback_paint (cairo_surface_t *surface, cairo_pattern_t *source) { cairo_status_t status; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_box_t box; cairo_traps_t traps; @@ -687,7 +687,7 @@ _cairo_surface_fallback_paint (cairo_surface_t *surface, return status; if (_cairo_operator_bounded_by_source (op)) { - cairo_rectangle_int16_t source_extents; + cairo_rectangle_int_t source_extents; status = _cairo_pattern_get_extents (source, &source_extents); if (status) return status; @@ -727,7 +727,7 @@ _cairo_surface_mask_draw_func (void *closure, cairo_surface_t *dst, int dst_x, int dst_y, - const cairo_rectangle_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_pattern_t *mask = closure; @@ -754,7 +754,7 @@ _cairo_surface_fallback_mask (cairo_surface_t *surface, cairo_pattern_t *mask) { cairo_status_t status; - cairo_rectangle_int16_t extents, source_extents, mask_extents; + cairo_rectangle_int_t extents, source_extents, mask_extents; status = _cairo_surface_get_extents (surface, &extents); if (status) @@ -804,14 +804,14 @@ _cairo_surface_fallback_stroke (cairo_surface_t *surface, cairo_status_t status; cairo_traps_t traps; cairo_box_t box; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; status = _cairo_surface_get_extents (surface, &extents); if (status) return status; if (_cairo_operator_bounded_by_source (op)) { - cairo_rectangle_int16_t source_extents; + cairo_rectangle_int_t source_extents; status = _cairo_pattern_get_extents (source, &source_extents); if (status) return status; @@ -866,14 +866,14 @@ _cairo_surface_fallback_fill (cairo_surface_t *surface, cairo_status_t status; cairo_traps_t traps; cairo_box_t box; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; status = _cairo_surface_get_extents (surface, &extents); if (status) return status; if (_cairo_operator_bounded_by_source (op)) { - cairo_rectangle_int16_t source_extents; + cairo_rectangle_int_t source_extents; status = _cairo_pattern_get_extents (source, &source_extents); if (status) return status; @@ -928,7 +928,7 @@ _cairo_surface_old_show_glyphs_draw_func (void *closure cairo_surface_t *dst, int dst_x, int dst_y, - const cairo_rectangle_int16_t *extents) + const cairo_rectangle_int_t *extents) { cairo_show_glyphs_info_t *glyph_info = closure; cairo_pattern_union_t pattern; @@ -991,7 +991,7 @@ _cairo_surface_fallback_show_glyphs (cairo_surface_t *surface, cairo_scaled_font_t *scaled_font) { cairo_status_t status; - cairo_rectangle_int16_t extents, glyph_extents; + cairo_rectangle_int_t extents, glyph_extents; cairo_show_glyphs_info_t glyph_info; status = _cairo_surface_get_extents (surface, &extents); @@ -1121,11 +1121,11 @@ cairo_status_t _cairo_surface_fallback_fill_rectangles (cairo_surface_t *surface, cairo_operator_t op, const cairo_color_t *color, - cairo_rectangle_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects) { fallback_state_t state; - cairo_rectangle_int16_t *offset_rects = NULL; + cairo_rectangle_int_t *offset_rects = NULL; cairo_status_t status; int x1, y1, x2, y2; int i; @@ -1165,7 +1165,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 = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int16_t)); + offset_rects = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int_t)); if (offset_rects == NULL) { status = CAIRO_STATUS_NO_MEMORY; goto DONE; diff --git a/src/cairo-surface.c b/src/cairo-surface.c index 7877458fa..a5c310907 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -956,9 +956,9 @@ _cairo_surface_release_source_image (cairo_surface_t *surface, **/ cairo_status_t _cairo_surface_acquire_dest_image (cairo_surface_t *surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void **image_extra) { assert (!surface->finished); @@ -982,9 +982,9 @@ _cairo_surface_acquire_dest_image (cairo_surface_t *surface, **/ void _cairo_surface_release_dest_image (cairo_surface_t *surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { assert (!surface->finished); @@ -1194,7 +1194,7 @@ _cairo_surface_fill_rectangle (cairo_surface_t *surface, int width, int height) { - cairo_rectangle_int16_t rect; + cairo_rectangle_int_t rect; assert (! surface->is_snapshot); @@ -1233,8 +1233,8 @@ _cairo_surface_fill_region (cairo_surface_t *surface, { int num_rects; pixman_box16_t *boxes; - cairo_rectangle_int16_t stack_rects[CAIRO_STACK_BUFFER_SIZE / sizeof (cairo_rectangle_int16_t)]; - cairo_rectangle_int16_t *rects; + cairo_rectangle_int_t stack_rects[CAIRO_STACK_BUFFER_SIZE / sizeof (cairo_rectangle_int_t)]; + cairo_rectangle_int_t *rects; cairo_status_t status; int i; @@ -1247,7 +1247,7 @@ _cairo_surface_fill_region (cairo_surface_t *surface, rects = stack_rects; if (num_rects > ARRAY_LENGTH (stack_rects)) { - rects = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int16_t)); + rects = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int_t)); if (!rects) return CAIRO_STATUS_NO_MEMORY; } @@ -1288,7 +1288,7 @@ cairo_status_t _cairo_surface_fill_rectangles (cairo_surface_t *surface, cairo_operator_t op, const cairo_color_t *color, - cairo_rectangle_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects) { cairo_int_status_t status; @@ -1813,7 +1813,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { if (surface->status) return surface->status; @@ -1941,15 +1941,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_int16_t *src_rectangle, - cairo_rectangle_int16_t *mask_rectangle, + cairo_rectangle_int_t *src_rectangle, + cairo_rectangle_int_t *mask_rectangle, int dst_x, int dst_y, unsigned int width, unsigned int height) { - cairo_rectangle_int16_t dst_rectangle; - cairo_rectangle_int16_t drawn_rectangle; + cairo_rectangle_int_t dst_rectangle; + cairo_rectangle_int_t drawn_rectangle; cairo_bool_t has_drawn_region = FALSE; cairo_bool_t has_clear_region = FALSE; pixman_region16_t drawn_region; @@ -2043,9 +2043,9 @@ _cairo_surface_composite_fixup_unbounded (cairo_surface_t *dst, unsigned int width, unsigned int height) { - cairo_rectangle_int16_t src_tmp, mask_tmp; - cairo_rectangle_int16_t *src_rectangle = NULL; - cairo_rectangle_int16_t *mask_rectangle = NULL; + cairo_rectangle_int_t src_tmp, mask_tmp; + cairo_rectangle_int_t *src_rectangle = NULL; + cairo_rectangle_int_t *mask_rectangle = NULL; assert (! dst->is_snapshot); @@ -2118,9 +2118,9 @@ _cairo_surface_composite_shape_fixup_unbounded (cairo_surface_t *dst, unsigned int width, unsigned int height) { - cairo_rectangle_int16_t src_tmp, mask_tmp; - cairo_rectangle_int16_t *src_rectangle = NULL; - cairo_rectangle_int16_t *mask_rectangle = NULL; + cairo_rectangle_int_t src_tmp, mask_tmp; + cairo_rectangle_int_t *src_rectangle = NULL; + cairo_rectangle_int_t *mask_rectangle = NULL; assert (! dst->is_snapshot); diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index 93b951705..ec0916ac2 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -888,7 +888,7 @@ _cairo_svg_surface_emit_composite_image_pattern (cairo_output_stream_t *outp { cairo_surface_t *surface; cairo_surface_attributes_t surface_attr; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_status_t status; cairo_matrix_t p2u; @@ -1647,7 +1647,7 @@ _cairo_svg_surface_fill (void *abstract_surface, static cairo_int_status_t _cairo_svg_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_svg_surface_t *surface = abstract_surface; diff --git a/src/cairo-win32-private.h b/src/cairo-win32-private.h index 08aeafa75..5f5d8d088 100644 --- a/src/cairo-win32-private.h +++ b/src/cairo-win32-private.h @@ -71,11 +71,11 @@ typedef struct _cairo_win32_surface { cairo_surface_t *image; - cairo_rectangle_int16_t clip_rect; + cairo_rectangle_int_t clip_rect; HRGN saved_clip; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; /* Surface DC flags */ uint32_t flags; diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c index 7f86eb8c5..c698e103c 100644 --- a/src/cairo-win32-surface.c +++ b/src/cairo-win32-surface.c @@ -547,9 +547,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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void **image_extra) { cairo_win32_surface_t *surface = abstract_surface; @@ -615,9 +615,9 @@ _cairo_win32_surface_acquire_dest_image (void *abstract_surfa static void _cairo_win32_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { cairo_win32_surface_t *surface = abstract_surface; @@ -736,7 +736,7 @@ static cairo_int_status_t _cairo_win32_surface_composite_inner (cairo_win32_surface_t *src, cairo_image_surface_t *src_image, cairo_win32_surface_t *dst, - cairo_rectangle_int16_t src_extents, + cairo_rectangle_int_t src_extents, cairo_rectangle_int32_t src_r, cairo_rectangle_int32_t dst_r, int alpha, @@ -844,7 +844,7 @@ _cairo_win32_surface_composite (cairo_operator_t op, cairo_image_surface_t *src_image = NULL; cairo_format_t src_format; - cairo_rectangle_int16_t src_extents; + cairo_rectangle_int_t src_extents; cairo_rectangle_int32_t src_r = { src_x, src_y, width, height }; cairo_rectangle_int32_t dst_r = { dst_x, dst_y, width, height }; @@ -1312,7 +1312,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_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects) { cairo_win32_surface_t *surface = abstract_surface; @@ -1465,7 +1465,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_win32_surface_t *surface = abstract_surface; diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c index f16de3f73..97148f51e 100644 --- a/src/cairo-xcb-surface.c +++ b/src/cairo-xcb-surface.c @@ -297,14 +297,14 @@ _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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect) + cairo_rectangle_int_t *image_rect) { cairo_image_surface_t *image; xcb_get_image_reply_t *imagerep; int bpp, bytes_per_line; - int x1, y1, x2, y2; + short x1, y1, x2, y2; unsigned char *data; cairo_format_masks_t masks; cairo_format_t format; @@ -642,9 +642,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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect_out, + cairo_rectangle_int_t *image_rect_out, void **image_extra) { cairo_xcb_surface_t *surface = abstract_surface; @@ -663,9 +663,9 @@ _cairo_xcb_surface_acquire_dest_image (void *abstract_surface static void _cairo_xcb_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { cairo_xcb_surface_t *surface = abstract_surface; @@ -1246,7 +1246,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_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects) { cairo_xcb_surface_t *surface = abstract_surface; @@ -1547,7 +1547,7 @@ _cairo_xcb_surface_set_clip_region (void *abstract_surface, static cairo_int_status_t _cairo_xcb_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_xcb_surface_t *surface = abstract_surface; diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 4c7a6995f..d0c248f69 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -496,13 +496,13 @@ _swap_ximage_to_native (XImage *ximage) static cairo_status_t _get_image_surface (cairo_xlib_surface_t *surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect) + cairo_rectangle_int_t *image_rect) { cairo_image_surface_t *image; XImage *ximage; - int x1, y1, x2, y2; + short x1, y1, x2, y2; cairo_format_masks_t masks; cairo_format_t format; @@ -879,9 +879,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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect_out, + cairo_rectangle_int_t *image_rect_out, void **image_extra) { cairo_xlib_surface_t *surface = abstract_surface; @@ -902,9 +902,9 @@ _cairo_xlib_surface_acquire_dest_image (void *abstract_surfac static void _cairo_xlib_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { cairo_xlib_surface_t *surface = abstract_surface; @@ -1522,7 +1522,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_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects) { cairo_xlib_surface_t *surface = abstract_surface; @@ -1819,7 +1819,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { cairo_xlib_surface_t *surface = abstract_surface; diff --git a/src/cairo.c b/src/cairo.c index 6859e45b5..f3c2f16de 100644 --- a/src/cairo.c +++ b/src/cairo.c @@ -478,7 +478,7 @@ void cairo_push_group_with_content (cairo_t *cr, cairo_content_t content) { cairo_status_t status; - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_surface_t *parent_surface, *group_surface = NULL; if (cr->status) diff --git a/src/cairoint.h b/src/cairoint.h index 96652976f..f0ea7023c 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -282,6 +282,18 @@ typedef struct _cairo_rectangle_int32 { uint32_t width, height; } cairo_rectangle_int32_t; +#if CAIRO_FIXED_BITS == 32 && CAIRO_FIXED_FRAC_BITS >= 16 +typedef cairo_rectangle_int16_t cairo_rectangle_int_t; +#define CAIRO_RECT_INT_MIN INT16_MIN +#define CAIRO_RECT_INT_MAX INT16_MAX +#elif CAIRO_FIXED_BITS == 32 +typedef cairo_rectangle_int32_t cairo_rectangle_int_t; +#define CAIRO_RECT_INT_MIN INT32_MIN +#define CAIRO_RECT_INT_MAX INT32_MAX +#else +#error Not sure how to pick a cairo_rectangle_int_t for your CAIRO_FIXED_BITS! +#endif + /* 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 offset */ @@ -357,7 +369,7 @@ typedef struct _cairo_edge { cairo_line_t edge; int clockWise; - cairo_fixed_16_16_t current_x; + cairo_fixed_t current_x; } cairo_edge_t; typedef struct _cairo_polygon { @@ -404,10 +416,10 @@ typedef struct _cairo_color cairo_color_t; typedef struct _cairo_image_surface cairo_image_surface_t; cairo_private void -_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_int16_t *rectangle); +_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_int_t *rectangle); cairo_private void -_cairo_rectangle_intersect (cairo_rectangle_int16_t *dest, cairo_rectangle_int16_t *src); +_cairo_rectangle_intersect (cairo_rectangle_int_t *dest, cairo_rectangle_int_t *src); /* cairo_array.c structures and functions */ @@ -683,16 +695,16 @@ struct _cairo_surface_backend { cairo_warn cairo_status_t (*acquire_dest_image) (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void **image_extra); void (*release_dest_image) (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra); /* Create a new surface (@clone_out) with the following @@ -733,7 +745,7 @@ struct _cairo_surface_backend { (*fill_rectangles) (void *surface, cairo_operator_t op, const cairo_color_t *color, - cairo_rectangle_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects); /* XXX: dst should be the first argument for consistency */ @@ -807,7 +819,7 @@ struct _cairo_surface_backend { */ cairo_warn cairo_int_status_t (*get_extents) (void *surface, - cairo_rectangle_int16_t *rectangle); + cairo_rectangle_int_t *rectangle); /* * This is an optional entry to let the surface manage its own glyph @@ -1631,7 +1643,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_int16_t *extents); + cairo_rectangle_int_t *extents); cairo_private cairo_status_t _cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font, @@ -1762,7 +1774,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_int16_t *rects, + cairo_rectangle_int_t *rects, int num_rects); cairo_private cairo_status_t @@ -1836,16 +1848,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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void **image_extra); cairo_private void _cairo_surface_release_dest_image (cairo_surface_t *surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra); cairo_private cairo_status_t @@ -1894,7 +1906,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_int16_t *rectangle); + cairo_rectangle_int_t *rectangle); cairo_private cairo_status_t _cairo_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font, @@ -2309,7 +2321,7 @@ _cairo_pattern_acquire_surfaces (cairo_pattern_t *src, cairo_private cairo_status_t _cairo_pattern_get_extents (cairo_pattern_t *pattern, - cairo_rectangle_int16_t *extents); + cairo_rectangle_int_t *extents); cairo_private void _cairo_pattern_reset_static_data (void); @@ -2325,7 +2337,7 @@ _cairo_gstate_get_antialias (cairo_gstate_t *gstate); cairo_private void _cairo_region_extents_rectangle (pixman_region16_t *region, - cairo_rectangle_int16_t *rect); + cairo_rectangle_int_t *rect); /* cairo_unicode.c */ diff --git a/src/test-fallback-surface.c b/src/test-fallback-surface.c index b2fa03ef6..db2587412 100644 --- a/src/test-fallback-surface.c +++ b/src/test-fallback-surface.c @@ -140,9 +140,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_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t **image_out, - cairo_rectangle_int16_t *image_rect_out, + cairo_rectangle_int_t *image_rect_out, void **image_extra) { test_fallback_surface_t *surface = abstract_surface; @@ -156,9 +156,9 @@ _test_fallback_surface_acquire_dest_image (void *abstract_surface, static void _test_fallback_surface_release_dest_image (void *abstract_surface, - cairo_rectangle_int16_t *interest_rect, + cairo_rectangle_int_t *interest_rect, cairo_image_surface_t *image, - cairo_rectangle_int16_t *image_rect, + cairo_rectangle_int_t *image_rect, void *image_extra) { test_fallback_surface_t *surface = abstract_surface; @@ -191,8 +191,8 @@ _test_fallback_surface_clone_similar (void *abstract_surface, } static cairo_int_status_t -_test_fallback_surface_get_extents (void *abstract_surface, - cairo_rectangle_int16_t *rectangle) +_test_fallback_surface_get_extents (void *abstract_surface, + cairo_rectangle_int_t *rectangle) { test_fallback_surface_t *surface = abstract_surface; diff --git a/src/test-meta-surface.c b/src/test-meta-surface.c index e2f6a0977..3992b4c69 100644 --- a/src/test-meta-surface.c +++ b/src/test-meta-surface.c @@ -174,7 +174,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { test_meta_surface_t *surface = abstract_surface; @@ -300,7 +300,7 @@ _test_meta_surface_snapshot (void *abstract_other) #if 0 return _cairo_surface_snapshot (other->meta); #else - cairo_rectangle_int16_t extents; + cairo_rectangle_int_t extents; cairo_surface_t *surface; status = _cairo_surface_get_extents (other->image, &extents); diff --git a/src/test-paginated-surface.c b/src/test-paginated-surface.c index 53e97eba6..99bd67c32 100644 --- a/src/test-paginated-surface.c +++ b/src/test-paginated-surface.c @@ -149,7 +149,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_int16_t *rectangle) + cairo_rectangle_int_t *rectangle) { test_paginated_surface_t *surface = abstract_surface;