path ops 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"
 
 void SkOpEdgeBuilder::init() {
     fCurrentContour = NULL;
     fOperand = false;
     fXorMask[0] = fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
             : kWinding_PathOpsMask;
-#if DEBUG_DUMP
-    gContourID = 0;
-    gSegmentID = 0;
+#ifdef SK_DEBUG
+    SkPathOpsDebug::gContourID = 0;
+    SkPathOpsDebug::gSegmentID = 0;
 #endif
     fUnparseable = false;
     fSecondHalf = preFetch();
 }
 
 void SkOpEdgeBuilder::addOperand(const SkPath& path) {
     SkASSERT(fPathVerbs.count() > 0 && fPathVerbs.end()[-1] == SkPath::kDone_Verb);
     fPathVerbs.pop_back();
     fPath = &path;
     fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
@@ skipping 48 matching lines @@
                     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) {
+                        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) {
                     continue;  // skip degenerate points
                 }
@@ skipping 90 matching lines @@
                 return false;
         }
         pointsPtr += SkPathOpsVerbToPoints(verb);
         SkASSERT(fCurrentContour);
     }
    if (fCurrentContour && !fAllowOpenContours && !close()) {
        return false;
    }
    return true;
 }