diff options
| author | Søren Sandmann Pedersen <sandmann@redhat.com> | 2009-02-17 06:30:49 -0500 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@redhat.com> | 2009-02-17 06:30:49 -0500 |
| commit | f37ebaa8f3089c4fa5f08bf16f8b52064006c64d (patch) | |
| tree | 0774a1f052abfe6cad85f2328c1446a2f576a4fd /src/cairo-path-fill.c | |
| parent | f8ce71d1f519bfad103f019312d536a9a605372b (diff) | |
| parent | 2760d558e65696657882f2219218aa71032ac5bc (diff) | |
Merge branch 'damage' of git+ssh://sandmann@freedesktop.org/home/sandmann/cairo-damage into damagedamage
Conflicts:
src/cairo.c
Diffstat (limited to 'src/cairo-path-fill.c')
| -rw-r--r-- | src/cairo-path-fill.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cairo-path-fill.c b/src/cairo-path-fill.c index a6dea083..7af91d20 100644 --- a/src/cairo-path-fill.c +++ b/src/cairo-path-fill.c @@ -177,18 +177,18 @@ _cairo_path_fixed_fill_to_traps (cairo_path_fixed_t *path, _cairo_filler_curve_to, _cairo_filler_close_path, &filler); - if (status) + if (unlikely (status)) goto BAIL; _cairo_polygon_close (&filler.polygon); status = _cairo_polygon_status (&filler.polygon); - if (status) + if (unlikely (status)) goto BAIL; status = _cairo_bentley_ottmann_tessellate_polygon (filler.traps, &filler.polygon, fill_rule); - if (status) + if (unlikely (status)) goto BAIL; BAIL: @@ -237,7 +237,7 @@ _cairo_path_fixed_fill_rectangle (cairo_path_fixed_t *path, * GdkRegion clip region during exposes. */ _cairo_path_fixed_iter_init (&iter, path); - while (_cairo_path_fixed_iter_is_box (&iter, &box)) { + while (_cairo_path_fixed_iter_is_fill_box (&iter, &box)) { cairo_status_t status; int cw = 0; |