diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 15:27:41 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 15:27:41 +0000 |
| commit | 4fdbb229649caf74e5c1b55a1823926df903af34 (patch) | |
| tree | 5f822b5335b213ce7f9857cac288e79e4f3cc8f9 /tests/PathOpsQuadLineIntersectionTest.cpp | |
| parent | 672222e400ec10024106a394512ce864d5b839ea (diff) | |
turn off debugging printfs
fix pathops issues 1417, 1418
be more rigorous about pulling intersections of lines to end points
rewrite cubic/line and quad/line intersections to share style
BUG=
Review URL: https://codereview.chromium.org/19543005
git-svn-id: http://skia.googlecode.com/svn/trunk@10270 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PathOpsQuadLineIntersectionTest.cpp')
| -rw-r--r-- | tests/PathOpsQuadLineIntersectionTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/PathOpsQuadLineIntersectionTest.cpp b/tests/PathOpsQuadLineIntersectionTest.cpp index 02c925cad2..555a90ce70 100644 --- a/tests/PathOpsQuadLineIntersectionTest.cpp +++ b/tests/PathOpsQuadLineIntersectionTest.cpp @@ -80,9 +80,9 @@ static void testOneOffs(skiatest::Reporter* reporter) { int result = doIntersect(intersections, quad, line, flipped); for (int inner = 0; inner < result; ++inner) { double quadT = intersections[0][inner]; - SkDPoint quadXY = quad.xyAtT(quadT); + SkDPoint quadXY = quad.ptAtT(quadT); double lineT = intersections[1][inner]; - SkDPoint lineXY = line.xyAtT(lineT); + SkDPoint lineXY = line.ptAtT(lineT); REPORTER_ASSERT(reporter, quadXY.approximatelyEqual(lineXY)); } } @@ -120,10 +120,10 @@ static void PathOpsQuadLineIntersectionTest(skiatest::Reporter* reporter) { for (int pt = 0; pt < result; ++pt) { double tt1 = intersections[0][pt]; REPORTER_ASSERT(reporter, tt1 >= 0 && tt1 <= 1); - SkDPoint t1 = quad.xyAtT(tt1); + SkDPoint t1 = quad.ptAtT(tt1); double tt2 = intersections[1][pt]; REPORTER_ASSERT(reporter, tt2 >= 0 && tt2 <= 1); - SkDPoint t2 = line.xyAtT(tt2); + SkDPoint t2 = line.ptAtT(tt2); if (!t1.approximatelyEqual(t2)) { SkDebugf("%s [%d,%d] x!= t1=%1.9g (%1.9g,%1.9g) t2=%1.9g (%1.9g,%1.9g)\n", __FUNCTION__, iIndex, pt, tt1, t1.fX, t1.fY, tt2, t2.fX, t2.fY); |