diff options
author | Samuel Rødal <sroedal@trolltech.com> | 2010-04-22 07:58:03 (GMT) |
---|---|---|
committer | Samuel Rødal <sroedal@trolltech.com> | 2010-04-22 09:28:56 (GMT) |
commit | f7d61dab69308f0993c8a5f2232226d1713ac4a7 (patch) | |
tree | 82d85d2353030719ee078b1f0ae9d4e0ad34366d /tests | |
parent | 7dc1d86ef4fd365483dec83b7cafff06521bf8eb (diff) | |
download | Qt-f7d61dab69308f0993c8a5f2232226d1713ac4a7.zip Qt-f7d61dab69308f0993c8a5f2232226d1713ac4a7.tar.gz Qt-f7d61dab69308f0993c8a5f2232226d1713ac4a7.tar.bz2 |
Removed bezier intersection code in path clipper.
The bezier intersections caused a lot of numerical stability issues, so
instead we now convert them to line segments. In the future it might be
possible to keep track of which bezier curve a line segment originated
from and reconstruct the bezier curves at the end.
Task-number: QTBUG-8035
Reviewed-by: Gunnar Sletta
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qpathclipper/tst_qpathclipper.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/qpathclipper/tst_qpathclipper.cpp index db5a13e..4dc12cb 100644 --- a/tests/auto/qpathclipper/tst_qpathclipper.cpp +++ b/tests/auto/qpathclipper/tst_qpathclipper.cpp @@ -285,46 +285,6 @@ static QPainterPath samplePath10() return path; } -static QPainterPath samplePath11() -{ - QPainterPath path; - path.moveTo(QPointF(165.71429, 338.79076)); - path.lineTo(QPointF(227.74288, 338.79076)); - path.cubicTo(QPointF(232.95048, 338.79076), - QPointF(237.14288, 342.88102), - QPointF(237.14288, 347.96176)); - path.lineTo(QPointF(237.14288, 366.76261)); - path.cubicTo(QPointF(237.14288, 371.84335), - QPointF(232.95048, 375.93361), - QPointF(227.74288, 375.93361)); - path.lineTo(QPointF(165.7142905131896, 375.93361)); - path.lineTo(QPointF(165.71429, 338.79076)); - return path; -} -static QPainterPath samplePath12() -{ - QPainterPath path; - path.moveTo(QPointF(333.297085225735, 61.53486494396167)); - path.cubicTo(QPointF(339.851755668807, 65.26555884471786), - QPointF(346.7164458828328, 69.04482864715078), - QPointF(353.4159970843586, 72.56059416636147)); - path.cubicTo(QPointF(353.4166971116034, 72.56155590850551), - QPointF(353.4173961086004, 72.56251809989483), - QPointF(353.4180950127331, 72.56348028832946)); - path.cubicTo(QPointF(342.4340366381152, 76.42344228577481), - QPointF(317.0596805768079, 94.67086588954379), - QPointF(309.78055, 101.00195)); - path.cubicTo(QPointF(286.0370715501102, 121.6530659984711), - QPointF(272.7748256344584, 134.1525788344904), - QPointF(250.7436468364447, 150.4434491585085)); - path.lineTo(QPointF(247.03629, 146.56585)); - path.lineTo(QPointF(240.71086, 91.501867)); - path.cubicTo(QPointF(240.71086, 91.501867), - QPointF(305.6382515924416, 62.21715375368672), - QPointF(333.297085225735, 61.53486494396167)); - return path; -} - static QPainterPath samplePath13() { QPainterPath path; @@ -412,16 +372,6 @@ void tst_QPathClipper::clip_data() << QPathClipper::BoolAnd << samplePath10(); - QTest::newRow( "simple11" ) << Paths::frame2()*QTransform().translate(40, 235) - << Paths::frame1() - << QPathClipper::BoolAnd - << samplePath11(); - - QTest::newRow( "intersection_at_edge" ) << Paths::lips() - << Paths::mailbox()*QTransform().translate(-85, 34) - << QPathClipper::BoolAnd - << samplePath12(); - QTest::newRow( "simple_move_to1" ) << Paths::rect4() << Paths::rect2() * QTransform().translate(-20, 50) << QPathClipper::BoolAnd |