cumulative pathops patch

tests/PathOpsThreeWayTest.cpp

Index: tests/PathOpsThreeWayTest.cpp
diff --git a/tests/PathOpsThreeWayTest.cpp b/tests/PathOpsThreeWayTest.cpp
index 15d6e5492742ecfad34a0b5ed90a559e9281e3b2..bf634f9f7e72f404291f841ff4fcd93fe4dcc251 100644
--- a/tests/PathOpsThreeWayTest.cpp
+++ b/tests/PathOpsThreeWayTest.cpp
@@ -49,14 +49,16 @@ static void testSetTest(skiatest::Reporter* reporter, int index) {
             const Curve& iTest = testSet.tests[inner];
             SkIntersections* i = combos.append();
             sk_bzero(i, sizeof(SkIntersections));
+            SkDLine oLine = {{ oTest.curve[0], oTest.curve[1] }};
+            SkDLine iLine = {{ iTest.curve[0], iTest.curve[1] }};
             if (oTest.ptCount == 1 && iTest.ptCount == 1) {
-                i->intersect(*(const SkDLine*) &oTest.curve, *(const SkDLine*) &iTest.curve);
+                i->intersect(oLine, iLine);
             } else if (oTest.ptCount == 1 && iTest.ptCount == 4) {
-                i->intersect(iTest.curve, *(const SkDLine*) &oTest.curve);
+                i->intersect(iTest.curve, oLine);
             } else if (oTest.ptCount == 4 && iTest.ptCount == 1) {
-                i->intersect(oTest.curve, *(const SkDLine*) &oTest.curve);
+                i->intersect(oTest.curve, iLine);
             } else if (oTest.ptCount == 4 && iTest.ptCount == 4) {
-                i->intersectB(oTest.curve, iTest.curve);
+                i->intersect(oTest.curve, iTest.curve);
             } else {
                 SkASSERT(0);
             }