Index: src/pathops/SkDQuadIntersection.cpp |
diff --git a/src/pathops/SkDQuadIntersection.cpp b/src/pathops/SkDQuadIntersection.cpp |
index 124c7dab065cec479aa8362202bd9c4e374c8245..e49e8cde74fc2fa2114a5d29753233359846123f 100644 |
--- a/src/pathops/SkDQuadIntersection.cpp |
+++ b/src/pathops/SkDQuadIntersection.cpp |
@@ -120,7 +120,7 @@ tryNextHalfPlane: |
static bool add_intercept(const SkDQuad& q1, const SkDQuad& q2, double tMin, double tMax, |
SkIntersections* i, bool* subDivide) { |
double tMid = (tMin + tMax) / 2; |
- SkDPoint mid = q2.xyAtT(tMid); |
+ SkDPoint mid = q2.ptAtT(tMid); |
SkDLine line; |
line[0] = line[1] = mid; |
SkDVector dxdy = q2.dxdyAtT(tMid); |
@@ -138,7 +138,7 @@ static bool add_intercept(const SkDQuad& q1, const SkDQuad& q2, double tMin, dou |
if (roots == 2) { |
return false; |
} |
- SkDPoint pt2 = q1.xyAtT(rootTs[0][0]); |
+ SkDPoint pt2 = q1.ptAtT(rootTs[0][0]); |
if (!pt2.approximatelyEqualHalf(mid)) { |
return false; |
} |
@@ -160,8 +160,8 @@ static bool is_linear_inner(const SkDQuad& q1, double t1s, double t1e, const SkD |
for (int idx2 = 0; idx2 < roots; ++idx2) { |
double t = rootTs[0][idx2]; |
#ifdef SK_DEBUG |
- SkDPoint qPt = q2.xyAtT(t); |
- SkDPoint lPt = testLines[index]->xyAtT(rootTs[1][idx2]); |
+ SkDPoint qPt = q2.ptAtT(t); |
+ SkDPoint lPt = testLines[index]->ptAtT(rootTs[1][idx2]); |
SkASSERT(qPt.approximatelyEqual(lPt)); |
#endif |
if (approximately_negative(t - t2s) || approximately_positive(t - t2e)) { |
@@ -183,12 +183,12 @@ static bool is_linear_inner(const SkDQuad& q1, double t1s, double t1e, const SkD |
tMin = tsFound[0]; |
tMax = tsFound[tsFound.count() - 1]; |
} |
- SkDPoint end = q2.xyAtT(t2s); |
+ SkDPoint end = q2.ptAtT(t2s); |
bool startInTriangle = hull.pointInHull(end); |
if (startInTriangle) { |
tMin = t2s; |
} |
- end = q2.xyAtT(t2e); |
+ end = q2.ptAtT(t2e); |
bool endInTriangle = hull.pointInHull(end); |
if (endInTriangle) { |
tMax = t2e; |
@@ -290,8 +290,8 @@ static bool binary_search(const SkDQuad& quad1, const SkDQuad& quad2, double* t1 |
SkDPoint t1[3], t2[3]; |
int calcMask = ~0; |
do { |
- if (calcMask & (1 << 1)) t1[1] = quad1.xyAtT(*t1Seed); |
- if (calcMask & (1 << 4)) t2[1] = quad2.xyAtT(*t2Seed); |
+ if (calcMask & (1 << 1)) t1[1] = quad1.ptAtT(*t1Seed); |
+ if (calcMask & (1 << 4)) t2[1] = quad2.ptAtT(*t2Seed); |
if (t1[1].approximatelyEqual(t2[1])) { |
*pt = t1[1]; |
#if ONE_OFF_DEBUG |
@@ -300,10 +300,10 @@ static bool binary_search(const SkDQuad& quad1, const SkDQuad& quad2, double* t1 |
#endif |
return true; |
} |
- if (calcMask & (1 << 0)) t1[0] = quad1.xyAtT(*t1Seed - tStep); |
- if (calcMask & (1 << 2)) t1[2] = quad1.xyAtT(*t1Seed + tStep); |
- if (calcMask & (1 << 3)) t2[0] = quad2.xyAtT(*t2Seed - tStep); |
- if (calcMask & (1 << 5)) t2[2] = quad2.xyAtT(*t2Seed + tStep); |
+ if (calcMask & (1 << 0)) t1[0] = quad1.ptAtT(*t1Seed - tStep); |
+ if (calcMask & (1 << 2)) t1[2] = quad1.ptAtT(*t1Seed + tStep); |
+ if (calcMask & (1 << 3)) t2[0] = quad2.ptAtT(*t2Seed - tStep); |
+ if (calcMask & (1 << 5)) t2[2] = quad2.ptAtT(*t2Seed + tStep); |
double dist[3][3]; |
// OPTIMIZE: using calcMask value permits skipping some distance calcuations |
// if prior loop's results are moved to correct slot for reuse |
@@ -423,7 +423,7 @@ int SkIntersections::intersect(const SkDQuad& q1, const SkDQuad& q2) { |
int r1Count = addValidRoots(roots1, rootCount, roots1Copy); |
SkDPoint pts1[4]; |
for (index = 0; index < r1Count; ++index) { |
- pts1[index] = q1.xyAtT(roots1Copy[index]); |
+ pts1[index] = q1.ptAtT(roots1Copy[index]); |
} |
double roots2[4]; |
int rootCount2 = findRoots(i1, q2, roots2, useCubic, flip2, 0); |
@@ -431,7 +431,7 @@ int SkIntersections::intersect(const SkDQuad& q1, const SkDQuad& q2) { |
int r2Count = addValidRoots(roots2, rootCount2, roots2Copy); |
SkDPoint pts2[4]; |
for (index = 0; index < r2Count; ++index) { |
- pts2[index] = q2.xyAtT(roots2Copy[index]); |
+ pts2[index] = q2.ptAtT(roots2Copy[index]); |
} |
if (r1Count == r2Count && r1Count <= 1) { |
if (r1Count == 1) { |