working on initial winding for cubics

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"
 
@@ skipping 184 matching lines @@
             case SkPath::kQuad_Verb:
                 fCurrentContour->addQuad(pointsPtr, fAllocator);
                 break;
             case SkPath::kConic_Verb:
                 fCurrentContour->addConic(pointsPtr, *weightPtr++, fAllocator);
                 break;
             case SkPath::kCubic_Verb: {
                 // split self-intersecting cubics in two before proceeding
                 // if the cubic is convex, it doesn't self intersect.
                 SkScalar loopT;
-                if (SkDCubic::ComplexBreak(pointsPtr, &loopT)) {
+                SkDCubic::CubicType cubicType;
+                if (SkDCubic::ComplexBreak(pointsPtr, &loopT, &cubicType)) {
                     SkPoint cubicPair[7]; 
                     SkChopCubicAt(pointsPtr, cubicPair, loopT);
                     if (!SkScalarsAreFinite(&cubicPair[0].fX, SK_ARRAY_COUNT(cubicPair) * 2)) {
                         return false;
                     }
                     SkPoint cStorage[2][4];
                     SkPath::Verb v1 = SkReduceOrder::Cubic(&cubicPair[0], cStorage[0]);
                     SkPath::Verb v2 = SkReduceOrder::Cubic(&cubicPair[3], cStorage[1]);
                     if (v1 != SkPath::kMove_Verb && v2 != SkPath::kMove_Verb) {
                         SkPoint* curve1 = v1 == SkPath::kCubic_Verb ? &cubicPair[0] : cStorage[0];
                         SkPoint* curve2 = v2 == SkPath::kCubic_Verb ? &cubicPair[3] : cStorage[1];
                         for (int index = 0; index < SkPathOpsVerbToPoints(v1); ++index) {
                             force_small_to_zero(&curve1[index]);
                         }
                         for (int index = 0; index < SkPathOpsVerbToPoints(v2); ++index) {
                             force_small_to_zero(&curve2[index]);
                         }
-                        fCurrentContour->addCurve(v1, curve1, fAllocator);
-                        fCurrentContour->addCurve(v2, curve2, fAllocator);
+                        fCurrentContour->addCurve(v1, curve1, fAllocator)->setCubicType(cubicType);
+                        fCurrentContour->addCurve(v2, curve2, fAllocator)->setCubicType(cubicType);
                     } else {
                         fCurrentContour->addCubic(pointsPtr, fAllocator);
                     }
                 } else {
                     fCurrentContour->addCubic(pointsPtr, fAllocator);
                 }
                 } break;
             case SkPath::kClose_Verb:
                 SkASSERT(fCurrentContour);
                 if (!close()) {
                     return false;
                 }
                 continue;
             default:
                 SkDEBUGFAIL("bad verb");
                 return false;
         }
         SkASSERT(fCurrentContour);
         fCurrentContour->debugValidate();
         pointsPtr += SkPathOpsVerbToPoints(verb);
     }
    if (fCurrentContour && fCurrentContour->count() &&!fAllowOpenContours && !close()) {
        return false;
    }
    return true;
 }