diff options
| author |  caryclark <caryclark@google.com> | 2015-04-29 08:28:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-29 08:28:30 -0700 |
| commit | aec251012542e971100e218bf463adbfb5d21d20 (patch) | |
| tree | 16c2e84c2d59d94b75d7d2bc50fec53c0e38a898 /src/pathops/SkDCubicLineIntersection.cpp | |
| parent | 97fdea6c4393cf0102d7eee5790782509fb4f57b (diff) | |
minor fixes to cubics code and overall alignment of how bounds and tops are computed for all curve types
All but 17 extended tests work.
A helper function is privately added to SkPath.h to permit a test to modify a given point in a path.
BUG=skia:3588
Review URL: https://codereview.chromium.org/1107353004
Diffstat (limited to 'src/pathops/SkDCubicLineIntersection.cpp')
| -rw-r--r-- | src/pathops/SkDCubicLineIntersection.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pathops/SkDCubicLineIntersection.cpp b/src/pathops/SkDCubicLineIntersection.cpp index f5fe01503b..f658b09f0b 100644 --- a/src/pathops/SkDCubicLineIntersection.cpp +++ b/src/pathops/SkDCubicLineIntersection.cpp @@ -135,7 +135,7 @@ public: + (fCubic[n].fX - fLine[0].fX) * adj; } double extremeTs[6]; - int extrema = SkDCubic::FindExtrema(c[0].fX, c[1].fX, c[2].fX, c[3].fX, extremeTs); + int extrema = SkDCubic::FindExtrema(&c[0].fX, extremeTs); count = c.searchRoots(extremeTs, extrema, 0, SkDCubic::kXAxis, roots); break; } @@ -171,7 +171,7 @@ public: SkDPoint calcPt = c.ptAtT(roots[index]); if (!approximately_equal(calcPt.fY, axisIntercept)) { double extremeTs[6]; - int extrema = SkDCubic::FindExtrema(c[0].fY, c[1].fY, c[2].fY, c[3].fY, extremeTs); + int extrema = SkDCubic::FindExtrema(&c[0].fY, extremeTs); count = c.searchRoots(extremeTs, extrema, axisIntercept, SkDCubic::kYAxis, roots); break; } @@ -234,7 +234,7 @@ public: SkDPoint calcPt = c.ptAtT(roots[index]); if (!approximately_equal(calcPt.fX, axisIntercept)) { double extremeTs[6]; - int extrema = SkDCubic::FindExtrema(c[0].fX, c[1].fX, c[2].fX, c[3].fX, extremeTs); + int extrema = SkDCubic::FindExtrema(&c[0].fX, extremeTs); count = c.searchRoots(extremeTs, extrema, axisIntercept, SkDCubic::kXAxis, roots); break; } |