fix some pathops bugs found in 1M skps

tests/PathOpsDebug.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PathOpsTSectDebug.h"
 #include "SkOpCoincidence.h"
 #include "SkOpContour.h"
@@ skipping 43 matching lines @@
     dumpInner();
     SkDebugf("},\n");
 }
 
 void SkDConic::dumpID(int id) const {
     dumpInner();
     SkDebugf("} id=%d\n", id);
 }
 
 void SkDConic::dumpInner() const {
-    SkDebugf("{{");
-    int index = 0;
-    do {
-        fPts[index].dump();
-        SkDebugf(", ");
-    } while (++index < 2);
-    fPts[index].dump();
-    SkDebugf("}, %1.9g", fWeight);
+    SkDebugf("{");
+    fPts.dumpInner();
+    SkDebugf("}}, %1.9gf", fWeight);
 }
 
 void SkDCubic::dump() const {
     this->dumpInner();
     SkDebugf("}},\n");
 }
 
 void SkDCubic::dumpID(int id) const {
     this->dumpInner();
     SkDebugf("}} id=%d\n", id);
@@ skipping 585 matching lines @@
     Dump(&q1c2);
     Dump(&k1q2);
     Dump(&k1k2);
     Dump(&k1c2);
     Dump(&c1q2);
     Dump(&c1k2);
     Dump(&c1c2);
 }
 
 template <typename TCurve, typename OppCurve>
+void DumpAll(const SkTSpan<TCurve, OppCurve>* span) {
+    span->dumpAll();
+}
+
+void DontCallDumpSpanAll();
+void DontCallDumpSpanAll() {  // exists to instantiate the templates
+    SkTSpan<SkDQuad, SkDQuad> q1q2; q1q2.debugInit();
+    SkTSpan<SkDQuad, SkDConic> q1k2; q1k2.debugInit();
+    SkTSpan<SkDQuad, SkDCubic> q1c2; q1c2.debugInit();
+    SkTSpan<SkDConic, SkDQuad> k1q2; k1q2.debugInit();
+    SkTSpan<SkDConic, SkDConic> k1k2; k1k2.debugInit();
+    SkTSpan<SkDConic, SkDCubic> k1c2; k1c2.debugInit();
+    SkTSpan<SkDCubic, SkDQuad> c1q2; c1q2.debugInit();
+    SkTSpan<SkDCubic, SkDConic> c1k2; c1k2.debugInit();
+    SkTSpan<SkDCubic, SkDCubic> c1c2; c1c2.debugInit();
+    DumpAll(&q1q2);
+    DumpAll(&q1k2);
+    DumpAll(&q1c2);
+    DumpAll(&k1q2);
+    DumpAll(&k1k2);
+    DumpAll(&k1c2);
+    DumpAll(&c1q2);
+    DumpAll(&c1k2);
+    DumpAll(&c1c2);
+}
+
+template <typename TCurve, typename OppCurve>
+void DumpBounded(const SkTSpan<TCurve, OppCurve>* span) {
+    span->dumpBounded(0);
+}
+
+void DontCallDumpSpanBounded();
+void DontCallDumpSpanBounded() {  // exists to instantiate the templates
+    SkTSpan<SkDQuad, SkDQuad> q1q2; q1q2.debugInit();
+    SkTSpan<SkDQuad, SkDConic> q1k2; q1k2.debugInit();
+    SkTSpan<SkDQuad, SkDCubic> q1c2; q1c2.debugInit();
+    SkTSpan<SkDConic, SkDQuad> k1q2; k1q2.debugInit();
+    SkTSpan<SkDConic, SkDConic> k1k2; k1k2.debugInit();
+    SkTSpan<SkDConic, SkDCubic> k1c2; k1c2.debugInit();
+    SkTSpan<SkDCubic, SkDQuad> c1q2; c1q2.debugInit();
+    SkTSpan<SkDCubic, SkDConic> c1k2; c1k2.debugInit();
+    SkTSpan<SkDCubic, SkDCubic> c1c2; c1c2.debugInit();
+    DumpBounded(&q1q2);
+    DumpBounded(&q1k2);
+    DumpBounded(&q1c2);
+    DumpBounded(&k1q2);
+    DumpBounded(&k1k2);
+    DumpBounded(&k1c2);
+    DumpBounded(&c1q2);
+    DumpBounded(&c1k2);
+    DumpBounded(&c1c2);
+}
+
+template <typename TCurve, typename OppCurve>
 void DumpCoin(const SkTSpan<TCurve, OppCurve>* span) {
     span->dumpCoin();
 }
 
 void DontCallDumpSpanCoin();
 void DontCallDumpSpanCoin() {  // exists to instantiate the templates
     SkTSpan<SkDQuad, SkDQuad> q1q2; q1q2.debugInit();
     SkTSpan<SkDQuad, SkDConic> q1k2; q1k2.debugInit();
     SkTSpan<SkDQuad, SkDCubic> q1c2; q1c2.debugInit();
     SkTSpan<SkDConic, SkDQuad> k1q2; k1q2.debugInit();
@@ skipping 391 matching lines @@
     } while (!span->final() && (span = span->upCast()->next()));
 }
 
 void SkOpSegment::dumpCoin() const {
     const SkOpSpan* span = &fHead;
     do {
         span->dumpCoin();
     } while ((span = span->next()->upCastable()));
 }
 
-void SkOpSegment::dumpPtsInner() const {
+void SkOpSegment::dumpPtsInner(const char* prefix) const {
     int last = SkPathOpsVerbToPoints(fVerb);
-    SkDebugf("seg=%d {{", this->debugID());
+    SkDebugf("%s=%d {{", prefix, this->debugID());
     if (fVerb == SkPath::kConic_Verb) {
         SkDebugf("{");
     }
     int index = 0;
     do {
         SkDPoint::Dump(fPts[index]);
         SkDebugf(", ");
     } while (++index < last);
     SkDPoint::Dump(fPts[index]);
     SkDebugf("}}");
     if (fVerb == SkPath::kConic_Verb) {
         SkDebugf(", %1.9gf}", fWeight);
     }
 }
 
-void SkOpSegment::dumpPts() const {
-    dumpPtsInner();
+void SkOpSegment::dumpPts(const char* prefix) const {
+    dumpPtsInner(prefix);
     SkDebugf("\n");
 }
 
 void SkCoincidentSpans::dump() const {
     SkDebugf("- seg=%d span=%d ptT=%d ", fCoinPtTStart->segment()->debugID(),
         fCoinPtTStart->span()->debugID(), fCoinPtTStart->debugID());
     fCoinPtTStart->dumpBase();
     SkDebugf(" span=%d ptT=%d ", fCoinPtTEnd->span()->debugID(), fCoinPtTEnd->debugID());
     fCoinPtTEnd->dumpBase();
     if (fCoinPtTStart->segment()->operand()) {
@@ skipping 16 matching lines @@
     }
     SkDebugf("\n");
 }
 
 void SkOpCoincidence::dump() const {
     SkCoincidentSpans* span = fHead;
     while (span) {
         span->dump();
         span = span->fNext;
     }
-    if (!fTop) {
+    if (!fTop || fHead == fTop) {
         return;
     }
     SkDebugf("top:\n");
     span = fTop;
+    if (fHead) {
+        span->dump();
+        return;
+    }
     while (span) {
         span->dump();
         span = span->fNext;
     }
 }
 
 void SkOpContour::dump() const {
     SkDebugf("contour=%d count=%d op=%d xor=%d\n", this->debugID(), fCount, fOperand, fXor);
     if (!fCount) {
         return;
@@ skipping 33 matching lines @@
 
 void SkOpContour::dumpPt(int index) const {
     const SkOpSegment* segment = &fHead;
     do {
         if (segment->debugID() == index) {
             segment->dumpPts();
         }
     } while ((segment = segment->next()));
 }
 
-void SkOpContour::dumpPts() const {
+void SkOpContour::dumpPts(const char* prefix) const {
     SkDebugf("contour=%d\n", this->debugID());
     const SkOpSegment* segment = &fHead;
     do {
-        SkDebugf("  seg=%d ", segment->debugID());
-        segment->dumpPts();
+        SkDebugf("  %s=%d ", prefix, segment->debugID());
+        segment->dumpPts(prefix);
     } while ((segment = segment->next()));
 }
 
-void SkOpContour::dumpPtsX() const {
+void SkOpContour::dumpPtsX(const char* prefix) const {
     if (!this->fCount) {
         SkDebugf("<empty>\n");
         return;
     }
     const SkOpSegment* segment = &fHead;
     do {
-        segment->dumpPts();
+        segment->dumpPts(prefix);
     } while ((segment = segment->next()));
 }
 
 void SkOpContour::dumpSegment(int index) const {
     debugSegment(index)->dump();
 }
 
-void SkOpContour::dumpSegments(SkPathOp op) const {
+void SkOpContour::dumpSegments(const char* prefix, SkPathOp op) const {
     bool firstOp = false;
     const SkOpContour* c = this;
     do {
-        if (!firstOp && c->operand()) {
+        if (!firstOp && c->operand() && op >= 0) {
 #if DEBUG_ACTIVE_OP
             SkDebugf("op %s\n", SkPathOpsDebug::kPathOpStr[op]);
 #endif
             firstOp = true;
         }
-        c->dumpPtsX();
+        c->dumpPtsX(prefix);
     } while ((c = c->next()));
 }
 
 void SkOpContour::dumpSpan(int index) const {
     debugSpan(index)->dump();
 }
 
 void SkOpContour::dumpSpans() const {
     SkDebugf("contour=%d\n", this->debugID());
     const SkOpSegment* segment = &fHead;
@@ skipping 106 matching lines @@
             segment = segment->next();
         }
     } while ((contour = contour->next()));
     return nullptr;
 }
 #endif
 
 #if DEBUG_T_SECT_DUMP > 1
 int gDumpTSectNum;
 #endif