pathops work in progress

src/pathops/SkAddIntersections.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkAddIntersections.h"
 #include "SkPathOpsBounds.h"
 
 #if DEBUG_ADD_INTERSECTING_TS
@@ skipping 365 matching lines @@
                         continue;
                     }
                     ts.cleanUpCoincidence();  // prefer (t == 0 or t == 1)
                     pts = 1;
                 }
             }
             if (pts >= 2) {
                 for (int pt = 0; pt < pts - 1; ++pt) {
                     const SkDPoint& point = ts.pt(pt);
                     const SkDPoint& next = ts.pt(pt + 1);
-                    if (wt.isNear(ts[swap][pt], ts[swap][pt + 1], point, next)
-                            && wn.isNear(ts[!swap][pt], ts[!swap][pt + 1], point, next)) {
+                    if (wt.isPartial(ts[swap][pt], ts[swap][pt + 1], point, next)
+                            && wn.isPartial(ts[!swap][pt], ts[!swap][pt + 1], point, next)) {
                         if (!wt.addPartialCoincident(wn, ts, pt, swap)) {
                             // remove extra point if two map to same float values
                             ts.cleanUpCoincidence();  // prefer (t == 0 or t == 1)
                             pts = 1;
                         }
                     }
                 }
             }
             for (int pt = 0; pt < pts; ++pt) {
                 SkASSERT(ts[0][pt] >= 0 && ts[0][pt] <= 1);
@@ skipping 43 matching lines @@
     }
     for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
         SkOpContour* contour = (*contourList)[cIndex];
         contour->calcCoincidentWinding();
     }
     for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
         SkOpContour* contour = (*contourList)[cIndex];
         contour->calcPartialCoincidentWinding();
     }
 }