diff options
| -rw-r--r-- | src/cairo-bentley-ottmann.c | 6 | ||||
| -rw-r--r-- | src/cairo-traps.c | 10 | ||||
| -rwxr-xr-x | src/cairoint.h | 21 |
3 files changed, 18 insertions, 19 deletions
diff --git a/src/cairo-bentley-ottmann.c b/src/cairo-bentley-ottmann.c index 1da974392..208da7ce0 100644 --- a/src/cairo-bentley-ottmann.c +++ b/src/cairo-bentley-ottmann.c @@ -1415,9 +1415,9 @@ update_minmax(cairo_fixed_t *inout_min, } cairo_status_t -_cairo_bentley_ottmann_tessellate_polygon (cairo_traps_t *traps, - cairo_polygon_t *polygon, - cairo_fill_rule_t fill_rule) +_cairo_bentley_ottmann_tessellate_polygon (cairo_traps_t *traps, + const cairo_polygon_t *polygon, + cairo_fill_rule_t fill_rule) { int intersections; cairo_status_t status; diff --git a/src/cairo-traps.c b/src/cairo-traps.c index 8d7160730..257fd0d3a 100644 --- a/src/cairo-traps.c +++ b/src/cairo-traps.c @@ -557,7 +557,8 @@ _cairo_trap_contains (cairo_trapezoid_t *t, cairo_point_t *pt) } cairo_bool_t -_cairo_traps_contain (cairo_traps_t *traps, double x, double y) +_cairo_traps_contain (const cairo_traps_t *traps, + double x, double y) { int i; cairo_point_t point; @@ -574,7 +575,8 @@ _cairo_traps_contain (cairo_traps_t *traps, double x, double y) } void -_cairo_traps_extents (cairo_traps_t *traps, cairo_box_t *extents) +_cairo_traps_extents (const cairo_traps_t *traps, + cairo_box_t *extents) { if (traps->num_traps == 0) { extents->p1.x = extents->p1.y = _cairo_fixed_from_int (0); @@ -598,8 +600,8 @@ _cairo_traps_extents (cairo_traps_t *traps, cairo_box_t *extents) * or %CAIRO_STATUS_NO_MEMORY **/ cairo_int_status_t -_cairo_traps_extract_region (cairo_traps_t *traps, - cairo_region_t *region) +_cairo_traps_extract_region (const cairo_traps_t *traps, + cairo_region_t *region) { cairo_box_int_t stack_boxes[CAIRO_STACK_ARRAY_LENGTH (cairo_box_int_t)]; cairo_box_int_t *boxes = stack_boxes; diff --git a/src/cairoint.h b/src/cairoint.h index 389a1cc38..913076569 100755 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -2109,30 +2109,27 @@ _cairo_traps_tessellate_triangle (cairo_traps_t *traps, cairo_point_t t[3]); cairo_private cairo_status_t _cairo_traps_tessellate_convex_quad (cairo_traps_t *traps, cairo_point_t q[4]); -cairo_private cairo_status_t -_cairo_traps_tessellate_polygon (cairo_traps_t *traps, - cairo_polygon_t *poly, - cairo_fill_rule_t fill_rule); - cairo_private void _cairo_traps_add_trap_from_points (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom, cairo_point_t left_p1, cairo_point_t left_p2, cairo_point_t right_p1, cairo_point_t right_p2); cairo_private cairo_status_t -_cairo_bentley_ottmann_tessellate_polygon (cairo_traps_t *traps, - cairo_polygon_t *polygon, - cairo_fill_rule_t fill_rule); +_cairo_bentley_ottmann_tessellate_polygon (cairo_traps_t *traps, + const cairo_polygon_t *polygon, + cairo_fill_rule_t fill_rule); cairo_private int -_cairo_traps_contain (cairo_traps_t *traps, double x, double y); +_cairo_traps_contain (const cairo_traps_t *traps, + double x, double y); cairo_private void -_cairo_traps_extents (cairo_traps_t *traps, cairo_box_t *extents); +_cairo_traps_extents (const cairo_traps_t *traps, + cairo_box_t *extents); cairo_private cairo_int_status_t -_cairo_traps_extract_region (cairo_traps_t *tr, - cairo_region_t *region); +_cairo_traps_extract_region (const cairo_traps_t *tr, + cairo_region_t *region); cairo_private void _cairo_trapezoid_array_translate_and_scale (cairo_trapezoid_t *offset_traps, |