diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2012-02-15 20:35:57 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2012-02-15 20:35:57 +0000 |
| commit | 1ffabe284d9f5a4ac055941d9817af71be1e5b54 (patch) | |
| tree | 2b816cb3cc40a5f3053c8371de5613041272e298 /extra/pixman | |
| parent | 650a87f5a67f6e71d4a56e52139a718d86ebbb46 (diff) | |
Wed Feb 15 20:35:56 UTC 2012
Diffstat (limited to 'extra/pixman')
| -rw-r--r-- | extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch b/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch deleted file mode 100644 index e661db57c..000000000 --- a/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e5555d7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001 -From: Søren Sandmann Pedersen <ssp@redhat.com> -Date: Wed, 25 Jan 2012 19:03:05 +0000 -Subject: Revert "Reject trapezoids where top (botttom) is above (below) the edges" - -Cairo 1.10 will sometimes generate trapezoids like this, so we can't -consider them invalid. Fixes bug 45009, reported by Michael Biebl. - -This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06. ---- -diff --git a/pixman/pixman.h b/pixman/pixman.h -index 20ff496..18d9513 100644 ---- a/pixman/pixman.h -+++ b/pixman/pixman.h -@@ -908,14 +908,10 @@ struct pixman_triangle - }; - - /* whether 't' is a well defined not obviously empty trapezoid */ --#define pixman_trapezoid_valid(t) \ -- ((t)->left.p1.y != (t)->left.p2.y && \ -- (t)->right.p1.y != (t)->right.p2.y && \ -- (int) ((t)->bottom - (t)->top) > 0 && \ -- (t)->bottom <= (t)->left.p2.y && \ -- (t)->bottom <= (t)->right.p2.y && \ -- (t)->top >= (t)->left.p1.y && \ -- (t)->top >= (t)->right.p1.y) -+#define pixman_trapezoid_valid(t) \ -+ ((t)->left.p1.y != (t)->left.p2.y && \ -+ (t)->right.p1.y != (t)->right.p2.y && \ -+ (int) ((t)->bottom - (t)->top) > 0) - - struct pixman_span_fix - { -diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c -index de518d8..ff03b50 100644 ---- a/test/composite-traps-test.c -+++ b/test/composite-traps-test.c -@@ -251,6 +251,6 @@ test_composite (int testnum, - int - main (int argc, const char *argv[]) - { -- return fuzzer_test_main("composite traps", 40000, 0x4346479C, -+ return fuzzer_test_main("composite traps", 40000, 0xE3112106, - test_composite, argc, argv); - } --- -cgit v0.9.0.2-2-gbebe |