| Index: src/pathops/SkDQuadIntersection.cpp
|
| diff --git a/src/pathops/SkDQuadIntersection.cpp b/src/pathops/SkDQuadIntersection.cpp
|
| index e10fb3f139f703abd3da67bc4fd161a16a2e046a..5869d7db19c0ac927b1130e1173626df8589dd01 100644
|
| --- a/src/pathops/SkDQuadIntersection.cpp
|
| +++ b/src/pathops/SkDQuadIntersection.cpp
|
| @@ -391,14 +391,22 @@ static void lookNearEnd(const SkDQuad& q1, const SkDQuad& q2, int testT,
|
|
|
| int SkIntersections::intersect(const SkDQuad& q1, const SkDQuad& q2) {
|
| // if the quads share an end point, check to see if they overlap
|
| -
|
| for (int i1 = 0; i1 < 3; i1 += 2) {
|
| for (int i2 = 0; i2 < 3; i2 += 2) {
|
| - if (q1[i1].approximatelyEqualHalf(q2[i2])) {
|
| + if (q1[i1] == q2[i2]) {
|
| insert(i1 >> 1, i2 >> 1, q1[i1]);
|
| }
|
| }
|
| }
|
| + if (fAllowNear || true) { // FIXME ? cubic/cubic intersection fails without (cubicOp67u)
|
| + for (int i1 = 0; i1 < 3; i1 += 2) {
|
| + for (int i2 = 0; i2 < 3; i2 += 2) {
|
| + if (q1[i1] != q2[i2] && q1[i1].approximatelyEqualHalf(q2[i2])) {
|
| + insertNear(i1 >> 1, i2 >> 1, q1[i1]);
|
| + }
|
| + }
|
| + }
|
| + }
|
| SkASSERT(fUsed < 3);
|
| if (only_end_pts_in_common(q1, q2)) {
|
| return fUsed;
|
|
|