cumulative pathops patch

tests/PathOpsThreeWayTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkIntersections.h"
 #include "SkTDArray.h"
 #include "Test.h"
 
@@ skipping 31 matching lines @@
     const TestSet& testSet = testSets[index];
     int testCount = testSet.testCount;
     SkASSERT(testCount > 1);
     SkTDArray<SkIntersections> combos;
     for (int outer = 0; outer < testCount - 1; ++outer) {
         const Curve& oTest = testSet.tests[outer];
         for (int inner = outer + 1; inner < testCount; ++inner) {
             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);
             }
 //            i->dump();
         }
     }
 }
 
 DEF_TEST(PathOpsThreeWay, reporter) {
     for (int index = 0; index < testSetsCount; ++index) {
         testSetTest(reporter, index);
         reporter->bumpTestCount();
     }
 }
 
 DEF_TEST(PathOpsThreeWayOneOff, reporter) {
     int index = 1;
     testSetTest(reporter, index);
 }