Index: src/pathops/SkPathOpsCubic.cpp |
diff --git a/src/pathops/SkPathOpsCubic.cpp b/src/pathops/SkPathOpsCubic.cpp |
index f82bc3530c13a0c8abdd50e3ff7a5a0af68bf835..2542ca58848c9e7da4834b165473c1f71ed3bc83 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; |
} |
} |