diff options
| author |  caryclark <caryclark@google.com> | 2015-03-24 07:28:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-24 07:28:17 -0700 |
| commit | ccec0f958ffc71a9986d236bc2eb335cb2111119 (patch) | |
| tree | f864209e3594293256ac391715d50222ff22d96b /tests/PathOpsThreeWayTest.cpp | |
| parent | 62a320c8d444cd04e4f2952c269ea4cbd58dee64 (diff) | |
pathops version two
R=reed@google.com
marked 'no commit' to attempt to get trybots to run
TBR=reed@google.com
Review URL: https://codereview.chromium.org/1002693002
Diffstat (limited to 'tests/PathOpsThreeWayTest.cpp')
| -rw-r--r-- | tests/PathOpsThreeWayTest.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/PathOpsThreeWayTest.cpp b/tests/PathOpsThreeWayTest.cpp index 15d6e54927..bf634f9f7e 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); } |