pathops tiger checkpoint

src/pathops/SkPathOpsSimplify.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 "SkAddIntersections.h"
 #include "SkOpCoincidence.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkPathOpsCommon.h"
@@ skipping 18 matching lines @@
                     }
                     SkASSERT(unsortable || !current->done());
                     SkOpSpanBase* nextStart = start;
                     SkOpSpanBase* nextEnd = end;
                     SkOpSegment* next = current->findNextWinding(&chase, &nextStart, &nextEnd,
                             &unsortable);
                     if (!next) {
                         if (!unsortable && simple->hasMove()
                                 && current->verb() != SkPath::kLine_Verb
                                 && !simple->isClosed()) {
-                            if (!current->addCurveTo(start, end, simple)) {
+                            // FIXME: put in the next two lines to avoid handling already added
+                            if (start->starter(end)->checkAlreadyAdded()) {
+                                simple->close();
+                            } else if (!current->addCurveTo(start, end, simple)) {
                                 return false;
                             }
                             if (!simple->isClosed()) {
                                 SkPathOpsDebug::ShowActiveSpans(contourList);
                             }
                         }
                         break;
                     }
         #if DEBUG_FLOW
             SkDebugf("%s current id=%d from=(%1.9g,%1.9g) to=(%1.9g,%1.9g)\n", __FUNCTION__,
@@ skipping 182 matching lines @@
     }
     if (scaleFactor > 1) {
         ScalePath(*result, scaleFactor, result);
     }
     return true;
 }
 
 bool Simplify(const SkPath& path, SkPath* result) {
     return SimplifyDebug(path, result  SkDEBUGPARAMS(true) SkDEBUGPARAMS(nullptr));
 }