pathops work in progress

src/pathops/SkOpEdgeBuilder.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 "SkGeometry.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkReduceOrder.h"
 
@@ skipping 24 matching lines @@
         return false;
     }
     complete();
     if (fCurrentContour && !fCurrentContour->segments().count()) {
         fContours.pop_back();
     }
     return true;
 }
 
 void SkOpEdgeBuilder::closeContour(const SkPoint& curveEnd, const SkPoint& curveStart) {
-    if ((!AlmostEqualUlps(curveEnd.fX, curveStart.fX)
-            || !AlmostEqualUlps(curveEnd.fY, curveStart.fY))) {
+    if (!SkDPoint::ApproximatelyEqual(curveEnd, curveStart)) {
         fPathVerbs.push_back(SkPath::kLine_Verb);
         fPathPts.push_back_n(1, &curveStart);
     } else {
-        if (curveEnd.fX != curveStart.fX || curveEnd.fY != curveStart.fY) {
-            fPathPts[fPathPts.count() - 1] = curveStart;
-        } else {
-            fPathPts[fPathPts.count() - 1] = curveStart;
-        }
+        fPathPts[fPathPts.count() - 1] = curveStart;
     }
     fPathVerbs.push_back(SkPath::kClose_Verb);
 }
 
 int SkOpEdgeBuilder::preFetch() {
     if (!fPath->isFinite()) {
         fUnparseable = true;
         return 0;
     }
     SkAutoConicToQuads quadder;
@@ skipping 10 matching lines @@
             case SkPath::kMove_Verb:
                 if (!fAllowOpenContours && lastCurve) {
                     closeContour(curve[0], curveStart);
                 }
                 fPathVerbs.push_back(verb);
                 fPathPts.push_back(pts[0]);
                 curveStart = curve[0] = pts[0];
                 lastCurve = false;
                 continue;
             case SkPath::kLine_Verb:
-                if (AlmostEqualUlps(curve[0].fX, pts[1].fX)
-                        && AlmostEqualUlps(curve[0].fY, pts[1].fY)) {
-                    if (fPathVerbs.back() != SkPath::kLine_Verb) {
+                if (SkDPoint::ApproximatelyEqual(curve[0], pts[1])) {
+                    uint8_t lastVerb = fPathVerbs.back();
+                    if (lastVerb != SkPath::kLine_Verb && lastVerb != SkPath::kMove_Verb) {
                         fPathPts.back() = pts[1];
                     }
                     continue;  // skip degenerate points
                 }
                 break;
             case SkPath::kQuad_Verb:
                 curve[1] = pts[1];
                 curve[2] = pts[2];
                 verb = SkReduceOrder::Quad(curve, pts);
                 if (verb == SkPath::kMove_Verb) {
@@ skipping 92 matching lines @@
                 return false;
         }
         pointsPtr += SkPathOpsVerbToPoints(verb);
         SkASSERT(fCurrentContour);
     }
    if (fCurrentContour && !fAllowOpenContours && !close()) {
        return false;
    }
    return true;
 }