commit 1049f1246e7be4ccb68001361efceb8933e6f81c
author caryclark <caryclark@google.com> Mon Apr 20 08:31:59 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Apr 20 08:31:59 2015 -0700
tree 9c71ceb245856cbe2173913eaec3b0ebb490dd74
parent 5c476fb2776639bdbf0e974dd38d1c5d4c4ff1aa

Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall.

Extended tests (150M+) run to completion in release in about 6 minutes; the standard test suite exceeds 100K and finishes in a few seconds on desktops.

TBR=reed
BUG=skia:3588

Review URL: https://codereview.chromium.org/1037953004

tests/PathOpsCubicQuadIntersectionTest.cpp

diff --git a/tests/PathOpsCubicQuadIntersectionTest.cpp b/tests/PathOpsCubicQuadIntersectionTest.cpp
index d1ce05b..98665af 100644
--- a/tests/PathOpsCubicQuadIntersectionTest.cpp
+++ b/tests/PathOpsCubicQuadIntersectionTest.cpp
@@ -16,6 +16,12 @@
     SkDCubic cubic;
     SkDQuad quad;
 } quadCubicTests[] = {
+    {{{{945.08099365234375, 747.1619873046875}, {982.5679931640625, 747.1619873046875}, {1013.6290283203125, 719.656005859375}, {1019.1910400390625, 683.72601318359375}}},
+     {{{945, 747}, {976.0660400390625, 747}, {998.03302001953125, 725.03302001953125}}}},
+
+    {{{{778, 14089}, {778, 14091.208984375}, {776.20916748046875, 14093}, {774, 14093}}},
+     {{{778, 14089}, {777.99957275390625, 14090.65625}, {776.82843017578125, 14091.828125}}}},
+
     {{{{1020.08099,672.161987}, {1020.08002,630.73999}, {986.502014,597.161987}, {945.080994,597.161987}}},
      {{{1020,672}, {1020,640.93396}, {998.03302,618.96698}}}},
 
@@ -63,9 +69,8 @@
         SkDebugf("[%d] quad order=%d\n", iIndex, order2);
         REPORTER_ASSERT(reporter, 0);
     }
-    SkDCubic quadToCubic = quad.toCubic();
     SkIntersections i;
-    int roots = i.intersect(cubic, quadToCubic);
+    int roots = i.intersect(cubic, quad);
     for (int pt = 0; pt < roots; ++pt) {
         double tt1 = i[0][pt];
         SkDPoint xy1 = cubic.ptAtT(tt1);