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
diff --git a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
index 7d1b133..63f9447 100644
--- a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
@@ -55,9 +55,9 @@
bool found = false;
for (int index = 0; index < result; ++index) {
double quadT = intersections[0][index];
- SkDPoint quadXY = quad.xyAtT(quadT);
+ SkDPoint quadXY = quad.ptAtT(quadT);
double lineT = intersections[1][index];
- SkDPoint lineXY = line.xyAtT(lineT);
+ SkDPoint lineXY = line.ptAtT(lineT);
if (quadXY.approximatelyEqual(lineXY)) {
found = true;
}
@@ -89,7 +89,7 @@
return;
}
for (int tIndex = 0; tIndex <= 4; ++tIndex) {
- SkDPoint xy = quad.xyAtT(tIndex / 4.0);
+ SkDPoint xy = quad.ptAtT(tIndex / 4.0);
for (int h = -2; h <= 2; ++h) {
for (int v = -2; v <= 2; ++v) {
if (h == v && abs(h) != 1) {