fix minor skp-found bugs

src/pathops/SkOpContour.cpp

 /*
 * Copyright 2013 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 #include "SkIntersections.h"
 #include "SkOpContour.h"
 #include "SkPathWriter.h"
 #include "SkTSort.h"
@@ skipping 193 matching lines @@
         if (startT == endT) {  // this can happen in very large compares
             continue;
         }
         double oStartT = coincidence.fTs[1][0];
         double oEndT = coincidence.fTs[1][1];
         if (oStartT == oEndT) {
             continue;
         }
         bool swapStart = startT > endT;
         bool swapOther = oStartT > oEndT;
+        const SkPoint* startPt = &coincidence.fPts[0];
+        const SkPoint* endPt = &coincidence.fPts[1];
         if (swapStart) {
-            SkTSwap<double>(startT, endT);
-            SkTSwap<double>(oStartT, oEndT);
+            SkTSwap(startT, endT);
+            SkTSwap(oStartT, oEndT);
+            SkTSwap(startPt, endPt);
         }
         bool cancel = swapOther != swapStart;
         int step = swapStart ? -1 : 1;
         int oStep = swapOther ? -1 : 1;
         double oMatchStart = cancel ? oEndT : oStartT;
         if (partial ? startT != 0 || oMatchStart != 0 : (startT == 0) != (oMatchStart == 0)) {
             bool added = false;
             if (oMatchStart != 0) {
-                added = thisOne.joinCoincidence(&other, oMatchStart, oStep, cancel);
+                const SkPoint& oMatchStartPt = cancel ? *endPt : *startPt;
+                added = thisOne.joinCoincidence(&other, oMatchStart, oMatchStartPt, oStep, cancel);
             }
             if (!cancel && startT != 0 && !added) {
-                (void) other.joinCoincidence(&thisOne, startT, step, cancel);
+                (void) other.joinCoincidence(&thisOne, startT, *startPt, step, cancel);
             }
         }
         double oMatchEnd = cancel ? oStartT : oEndT;
         if (partial ? endT != 1 || oMatchEnd != 1 : (endT == 1) != (oMatchEnd == 1)) {
             bool added = false;
             if (cancel && endT != 1 && !added) {
-                (void) other.joinCoincidence(&thisOne, endT, -step, cancel);
+                (void) other.joinCoincidence(&thisOne, endT, *endPt, -step, cancel);
             }
         }
     }
 }
 
 void SkOpContour::calcCommonCoincidentWinding(const SkCoincidence& coincidence) {
     int thisIndex = coincidence.fSegments[0];
     SkOpSegment& thisOne = fSegments[thisIndex];
     if (thisOne.done()) {
         return;
@@ skipping 76 matching lines @@
     fDone = true;  // may be cleared below
     for ( ; sortedIndex < segmentCount; ++sortedIndex) {
         SkOpSegment* testSegment = fSortedSegments[sortedIndex];
         if (testSegment->done()) {
             if (sortedIndex == fFirstSorted) {
                 ++fFirstSorted;
             }
             continue;
         }
         fDone = false;
-        SkPoint testXY = testSegment->activeLeftTop(true, NULL);
+        SkPoint testXY = testSegment->activeLeftTop(NULL);
         if (*topStart) {
             if (testXY.fY < topLeft.fY) {
                 continue;
             }
             if (testXY.fY == topLeft.fY && testXY.fX < topLeft.fX) {
                 continue;
             }
             if (bestXY->fY < testXY.fY) {
                 continue;
             }
@@ skipping 53 matching lines @@
         SkDebugf("%s empty contour\n", __FUNCTION__);
         SkASSERT(0);
         // FIXME: delete empty contour?
         return;
     }
     fBounds = fSegments.front().bounds();
     for (int index = 1; index < count; ++index) {
         fBounds.add(fSegments[index].bounds());
     }
 }