summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2012-01-25 19:03:05 (GMT)
committerSøren Sandmann Pedersen <ssp@redhat.com>2012-02-09 00:01:05 (GMT)
commitc5c866a394c823b2980eff15ce33ce8356010bbe (patch)
tree12fc52f8e7cdfdf8aec2d2a7bff1c42749fc9bd7
parent1ceb66750c33c896bdb04b47ed44977112817a86 (diff)
downloadpixman-c5c866a394c823b2980eff15ce33ce8356010bbe.tar.gz
pixman-c5c866a394c823b2980eff15ce33ce8356010bbe.tar.xz
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.
-rw-r--r--pixman/pixman.h12
-rw-r--r--test/composite-traps-test.c2
2 files changed, 5 insertions, 9 deletions
diff --git a/pixman/pixman.h b/pixman/pixman.h
index ab04103..c57092a 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -906,14 +906,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 60affe3..fa6d8a9 100644
--- a/test/composite-traps-test.c
+++ b/test/composite-traps-test.c
@@ -252,6 +252,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);
}