Attachment 3022 Details for Bug 4220 – Proposed patch

[patch] Proposed patch

cairo-traps-rect.patch (text/plain), 2.01 KB, created by Owen Taylor on 2005-08-24 12:52:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2005-08-24 12:52:03 UTC

Size: 2.01 KB

patch

obsolete

>Index: cairo-traps.c
>===================================================================
>RCS file: /cvs/cairo/cairo/src/cairo-traps.c,v
>retrieving revision 1.29
>diff -u -p -r1.29 cairo-traps.c
>--- cairo-traps.c	5 Aug 2005 05:45:59 -0000	1.29
>+++ cairo-traps.c	24 Aug 2005 19:50:50 -0000
>@@ -827,16 +827,10 @@ _cairo_traps_extract_region (cairo_traps
>     for (i = 0; i < traps->num_traps; i++)
> 	if (!(traps->traps[i].left.p1.x == traps->traps[i].left.p2.x
> 	      && traps->traps[i].right.p1.x == traps->traps[i].right.p2.x
>-	      && traps->traps[i].left.p1.y == traps->traps[i].right.p1.y
>-	      && traps->traps[i].left.p2.y == traps->traps[i].right.p2.y
>+	      && _cairo_fixed_is_integer(traps->traps[i].top)
>+	      && _cairo_fixed_is_integer(traps->traps[i].bottom)
> 	      && _cairo_fixed_is_integer(traps->traps[i].left.p1.x)
>-	      && _cairo_fixed_is_integer(traps->traps[i].left.p1.y)
>-	      && _cairo_fixed_is_integer(traps->traps[i].left.p2.x)
>-	      && _cairo_fixed_is_integer(traps->traps[i].left.p2.y)
>-	      && _cairo_fixed_is_integer(traps->traps[i].right.p1.x)
>-	      && _cairo_fixed_is_integer(traps->traps[i].right.p1.y)
>-	      && _cairo_fixed_is_integer(traps->traps[i].right.p2.x)
>-	      && _cairo_fixed_is_integer(traps->traps[i].right.p2.y))) {
>+	      && _cairo_fixed_is_integer(traps->traps[i].right.p1.x))) {
> 	    *region = NULL;
> 	    return CAIRO_STATUS_SUCCESS;
> 	}
>@@ -845,9 +839,9 @@ _cairo_traps_extract_region (cairo_traps
> 
>     for (i = 0; i < traps->num_traps; i++) {
> 	int x = _cairo_fixed_integer_part(traps->traps[i].left.p1.x);
>-	int y = _cairo_fixed_integer_part(traps->traps[i].left.p1.y);
>+	int y = _cairo_fixed_integer_part(traps->traps[i].top);
> 	int width = _cairo_fixed_integer_part(traps->traps[i].right.p1.x) - x;
>-	int height = _cairo_fixed_integer_part(traps->traps[i].left.p2.y) - y;
>+	int height = _cairo_fixed_integer_part(traps->traps[i].bottom) - y;
> 
> 	/* XXX: Sometimes we get degenerate trapezoids from the tesellator,
> 	 * if we call pixman_region_union_rect(), it bizarrly fails on such

Actions: View | Splinter Review

Attachments on bug 4220: 3020 | 3021 | 3022

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.