commit 570863f2e22b8ea7d7c504bd15e4f766af097df2
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Sep 16 15:55:01 2013 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Sep 16 15:55:01 2013 +0000
tree aa07d18266edd483ee71d7be9491da622cf400f3
parent cf7854057638dfa75e788f3f8babed75d587d444

path ops work in progress

path ops work in progress

BUG=

Review URL: https://codereview.chromium.org/21359002

git-svn-id: http://skia.googlecode.com/svn/trunk@11291 2bbb7eff-a529-9590-31e7-b0007b416f81

src/pathops/SkOpEdgeBuilder.cpp

diff --git a/src/pathops/SkOpEdgeBuilder.cpp b/src/pathops/SkOpEdgeBuilder.cpp
index a5a6584..676c34f 100644
--- a/src/pathops/SkOpEdgeBuilder.cpp
+++ b/src/pathops/SkOpEdgeBuilder.cpp
@@ -13,9 +13,9 @@
     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();
@@ -84,6 +84,9 @@
             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;