update pathops to circle sort

tests/PathOpsCubicLineIntersectionTest.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 "PathOpsTestCommon.h"
 #include "SkIntersections.h"
 #include "SkPathOpsCubic.h"
 #include "SkPathOpsLine.h"
 #include "SkReduceOrder.h"
 #include "Test.h"
 
 static struct lineCubic {
     SkDCubic cubic;
     SkDLine line;
 } lineCubicTests[] = {
+    {{{{421, 378}, {421, 380.209137f}, {418.761414f, 382}, {416, 382}}},
+            {{{320, 378}, {421, 378.000031f}}}},
+
+    {{{{416, 383}, {418.761414f, 383}, {421, 380.761414f}, {421, 378}}},
+            {{{320, 378}, {421, 378.000031f}}}},
+
     {{{{154,715}, {151.238571,715}, {149,712.761414}, {149,710}}},
             {{{149,675}, {149,710.001465}}}},
 
     {{{{0,1}, {1,6}, {4,1}, {4,3}}},
             {{{6,1}, {1,4}}}},
 
     {{{{0,1}, {2,6}, {4,1}, {5,4}}},
             {{{6,2}, {1,4}}}},
 
     {{{{0,4}, {3,4}, {6,2}, {5,2}}},
@@ skipping 38 matching lines @@
             double tt1 = i[0][pt];
             SkDPoint xy1 = cubic.ptAtT(tt1);
             double tt2 = i[1][pt];
             SkDPoint xy2 = line.ptAtT(tt2);
             if (!xy1.approximatelyEqual(xy2)) {
                 SkDebugf("%s [%d,%d] x!= t1=%g (%g,%g) t2=%g (%g,%g)\n",
                     __FUNCTION__, iIndex, pt, tt1, xy1.fX, xy1.fY, tt2, xy2.fX, xy2.fY);
             }
             REPORTER_ASSERT(reporter, xy1.approximatelyEqual(xy2));
         }
+#if ONE_OFF_DEBUG
+        double cubicT = i[0][0];
+        SkDPoint prev = cubic.ptAtT(cubicT * 2 - 1);
+        SkDPoint sect = cubic.ptAtT(cubicT);
+        double left[3] = { line.isLeft(prev), line.isLeft(sect), line.isLeft(cubic[3]) };
+        SkDebugf("cubic=(%1.9g, %1.9g, %1.9g)\n", left[0], left[1], left[2]);
+        SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", prev.fX, prev.fY, sect.fX, sect.fY);
+        SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", sect.fX, sect.fY, cubic[3].fX, cubic[3].fY);
+        SkDPoint prevL = line.ptAtT(i[1][0] - 0.0000007);
+        SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", prevL.fX, prevL.fY, i.pt(0).fX, i.pt(0).fY);
+        SkDPoint nextL = line.ptAtT(i[1][0] + 0.0000007);
+        SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", i.pt(0).fX, i.pt(0).fY, nextL.fX, nextL.fY);
+        SkDebugf("prevD=%1.9g dist=%1.9g nextD=%1.9g\n", prev.distance(nextL),
+                sect.distance(i.pt(0)), cubic[3].distance(prevL));
+#endif
     }
 }
 
 DEF_TEST(PathOpsCubicLineIntersection, reporter) {
     for (size_t index = 0; index < lineCubicTests_count; ++index) {
         int iIndex = static_cast<int>(index);
         testOne(reporter, iIndex);
         reporter->bumpTestCount();
     }
 }
 
 DEF_TEST(PathOpsCubicLineIntersectionOneOff, reporter) {
     int iIndex = 0;
     testOne(reporter, iIndex);
     const SkDCubic& cubic = lineCubicTests[iIndex].cubic;
     const SkDLine& line = lineCubicTests[iIndex].line;
     SkIntersections i;
     i.intersect(cubic, line);
     SkASSERT(i.used() == 1);
-#if ONE_OFF_DEBUG
-    double cubicT = i[0][0];
-    SkDPoint prev = cubic.ptAtT(cubicT * 2 - 1);
-    SkDPoint sect = cubic.ptAtT(cubicT);
-    double left[3] = { line.isLeft(prev), line.isLeft(sect), line.isLeft(cubic[3]) };
-    SkDebugf("cubic=(%1.9g, %1.9g, %1.9g)\n", left[0], left[1], left[2]);
-    SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", prev.fX, prev.fY, sect.fX, sect.fY);
-    SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", sect.fX, sect.fY, cubic[3].fX, cubic[3].fY);
-    SkDPoint prevL = line.ptAtT(i[1][0] - 0.0000007);
-    SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", prevL.fX, prevL.fY, i.pt(0).fX, i.pt(0).fY);
-    SkDPoint nextL = line.ptAtT(i[1][0] + 0.0000007);
-    SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", i.pt(0).fX, i.pt(0).fY, nextL.fX, nextL.fY);
-    SkDebugf("prevD=%1.9g dist=%1.9g nextD=%1.9g\n", prev.distance(nextL),
-            sect.distance(i.pt(0)), cubic[3].distance(prevL));
-#endif
 }