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/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp
index 4c362b6..f7507a0 100644
--- a/tests/PathOpsAngleTest.cpp
+++ b/tests/PathOpsAngleTest.cpp
@@ -257,8 +257,8 @@
if (useIntersectPt) {
break;
}
- start = dLine.xyAtT(set[idx].tStart).asSkPoint();
- end = dLine.xyAtT(set[idx].tEnd).asSkPoint();
+ start = dLine.ptAtT(set[idx].tStart).asSkPoint();
+ end = dLine.ptAtT(set[idx].tEnd).asSkPoint();
} break;
case 3: {
SkASSERT(ValidPoints(data, 3));
@@ -269,8 +269,8 @@
if (useIntersectPt) {
break;
}
- start = dQuad.xyAtT(set[idx].tStart).asSkPoint();
- end = dQuad.xyAtT(set[idx].tEnd).asSkPoint();
+ start = dQuad.ptAtT(set[idx].tStart).asSkPoint();
+ end = dQuad.ptAtT(set[idx].tEnd).asSkPoint();
} break;
case 4: {
SkASSERT(ValidPoints(data, 4));
@@ -281,8 +281,8 @@
if (useIntersectPt) {
break;
}
- start = dCubic.xyAtT(set[idx].tStart).asSkPoint();
- end = dCubic.xyAtT(set[idx].tEnd).asSkPoint();
+ start = dCubic.ptAtT(set[idx].tStart).asSkPoint();
+ end = dCubic.ptAtT(set[idx].tEnd).asSkPoint();
} break;
}
double tStart = set[idx].tStart;