diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-14 21:19:54 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-19 21:14:34 +0100 |
| commit | b132fae5e843c329d1414d1a65b2e8d66b99852f (patch) | |
| tree | 7df5e21300eefe3abcc30616b22d7f5d3248b4d4 /src/cairo-scaled-font-subsets.c | |
| parent | f58ade7bace8c82d0ea6740f56d227696181d616 (diff) | |
| download | cairo-b132fae5e843c329d1414d1a65b2e8d66b99852f.tar.gz | |
clip: Rudimentary support for clip-polygon extraction
Step 1, fix the failings sighted recently by tracking clip-boxes as an
explicit property of the clipping and of composition.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/cairo-scaled-font-subsets.c')
| -rw-r--r-- | src/cairo-scaled-font-subsets.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c index 433ca3f9d..dd6b8244f 100644 --- a/src/cairo-scaled-font-subsets.c +++ b/src/cairo-scaled-font-subsets.c @@ -511,7 +511,7 @@ _cairo_sub_font_add_glyph (cairo_sub_font_t *sub_font, int *num_glyphs_in_subset_ptr; double x_advance; double y_advance; - cairo_status_t status; + cairo_int_status_t status; _cairo_scaled_font_freeze_cache (sub_font->scaled_font); status = _cairo_scaled_glyph_lookup (sub_font->scaled_font, @@ -828,7 +828,7 @@ _cairo_scaled_font_subsets_map_glyph (cairo_scaled_font_subsets_t *subsets, cairo_matrix_t identity; cairo_font_options_t font_options; cairo_scaled_font_t *unscaled_font; - cairo_status_t status; + cairo_int_status_t status; int max_glyphs; cairo_bool_t type1_font; @@ -881,10 +881,10 @@ _cairo_scaled_font_subsets_map_glyph (cairo_scaled_font_subsets_t *subsets, &scaled_glyph); _cairo_scaled_font_thaw_cache (scaled_font); } - if (_cairo_status_is_error (status)) + if (_cairo_int_status_is_error (status)) return status; - if (status == CAIRO_STATUS_SUCCESS && + if (status == CAIRO_INT_STATUS_SUCCESS && subsets->type != CAIRO_SUBSETS_SCALED && ! _cairo_font_face_is_user (scaled_font->font_face)) { |