diff options
| author | Loïc Minier <lool@dooz.org> | 2009-04-15 00:04:31 +0200 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2009-04-15 00:04:31 +0200 |
| commit | 9389fe1633eba6995dc21d842f11877e9dc73d50 (patch) | |
| tree | 095cfd358a4555dc11175ca7f1757967bf209495 /src/cairo-clip-private.h | |
| parent | 16d49f3f8c989c70e7dcd1ae113f208b1ba3dad9 (diff) | |
Imported Upstream version 1.5.4
Diffstat (limited to 'src/cairo-clip-private.h')
| -rw-r--r-- | src/cairo-clip-private.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/cairo-clip-private.h b/src/cairo-clip-private.h index e7190cf..2e1eabd 100644 --- a/src/cairo-clip-private.h +++ b/src/cairo-clip-private.h @@ -36,22 +36,25 @@ #ifndef CAIRO_CLIP_PRIVATE_H #define CAIRO_CLIP_PRIVATE_H +#include "cairo-compiler-private.h" #include "cairo-path-fixed-private.h" extern const cairo_private cairo_rectangle_list_t _cairo_rectangles_nil; struct _cairo_clip_path { - unsigned int ref_count; - cairo_path_fixed_t path; - cairo_fill_rule_t fill_rule; - double tolerance; - cairo_antialias_t antialias; - cairo_clip_path_t *prev; + cairo_reference_count_t ref_count; + cairo_path_fixed_t path; + cairo_fill_rule_t fill_rule; + double tolerance; + cairo_antialias_t antialias; + cairo_clip_path_t *prev; }; struct _cairo_clip { cairo_clip_mode_t mode; + cairo_bool_t all_clipped; + /* * Mask-based clipping for cases where the backend * clipping isn't sufficiently able. @@ -63,7 +66,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 @@ -72,7 +75,7 @@ struct _cairo_clip { /* * A clip region that can be placed in the surface */ - pixman_region16_t region; + cairo_region_t region; cairo_bool_t has_region; /* * If the surface supports path clipping, we store the list of @@ -105,11 +108,11 @@ _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, - pixman_region16_t *region); + cairo_region_t *region); cairo_private cairo_status_t _cairo_clip_combine_to_surface (cairo_clip_t *clip, @@ -117,7 +120,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, |