diff options
| author |  caryclark <caryclark@google.com> | 2015-09-04 05:00:15 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-04 05:00:15 -0700 |
| commit | 6ff734b311e11ba79c0fad8602cd6e890d438cb6 (patch) | |
| tree | 4eea2d6036bae1673740b5b40135215353b25c7d /src/pathops/SkPathOpsCubic.cpp | |
| parent | 5a9a5b3e7fc5bd79af55f22cb674e8d2d7021d9d (diff) | |
remove unused fields from SkOpSegment
TBR=reed@google.com
Review URL: https://codereview.chromium.org/1322413002
Diffstat (limited to 'src/pathops/SkPathOpsCubic.cpp')
| -rw-r--r-- | src/pathops/SkPathOpsCubic.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/pathops/SkPathOpsCubic.cpp b/src/pathops/SkPathOpsCubic.cpp index f82bc3530c..2542ca5884 100644 --- a/src/pathops/SkPathOpsCubic.cpp +++ b/src/pathops/SkPathOpsCubic.cpp @@ -229,7 +229,7 @@ bool SkDCubic::isLinear(int startIndex, int endIndex) const { return approximately_zero_when_compared_to(distance, largest); } -bool SkDCubic::ComplexBreak(const SkPoint pointsPtr[4], SkScalar* t, CubicType* resultType) { +bool SkDCubic::ComplexBreak(const SkPoint pointsPtr[4], SkScalar* t) { SkScalar d[3]; SkCubicType cubicType = SkClassifyCubic(pointsPtr, d); if (cubicType == kLoop_SkCubicType) { @@ -246,7 +246,6 @@ bool SkDCubic::ComplexBreak(const SkPoint pointsPtr[4], SkScalar* t, CubicType* SkScalar smaller = SkTMax(0.f, SkTMin(ls, ms)); SkScalar larger = SkTMin(1.f, SkTMax(ls, ms)); *t = (smaller + larger) / 2; - *resultType = kSplitAtLoop_SkDCubicType; return *t > 0 && *t < 1; } } else if (kSerpentine_SkCubicType == cubicType || kCusp_SkCubicType == cubicType) { @@ -278,13 +277,11 @@ bool SkDCubic::ComplexBreak(const SkPoint pointsPtr[4], SkScalar* t, CubicType* for (int index = 0; index < roots; ++index) { if (between(inflectionTs[0], maxCurvature[index], inflectionTs[1])) { *t = maxCurvature[index]; - *resultType = kSplitAtMaxCurvature_SkDCubicType; return true; } } } else if (infTCount == 1) { *t = inflectionTs[0]; - *resultType = kSplitAtInflection_SkDCubicType; return *t > 0 && *t < 1; } } |