| Index: src/effects/Sk1DPathEffect.cpp
|
| diff --git a/src/effects/Sk1DPathEffect.cpp b/src/effects/Sk1DPathEffect.cpp
|
| index 4be6f975d3bfa792e7cec3fbe35a25c566699850..041886e1db9f146f870a034d19b3e5deb4c2e4f4 100644
|
| --- a/src/effects/Sk1DPathEffect.cpp
|
| +++ b/src/effects/Sk1DPathEffect.cpp
|
| @@ -35,33 +35,39 @@
|
| SkPath1DPathEffect::SkPath1DPathEffect(const SkPath& path, SkScalar advance,
|
| SkScalar phase, Style style) : fPath(path)
|
| {
|
| - SkASSERT(advance > 0 && !path.isEmpty());
|
| - // cleanup their phase parameter, inverting it so that it becomes an
|
| - // offset along the path (to match the interpretation in PostScript)
|
| - if (phase < 0) {
|
| - phase = -phase;
|
| - if (phase > advance) {
|
| - phase = SkScalarMod(phase, advance);
|
| - }
|
| + if (advance <= 0 || path.isEmpty()) {
|
| + SkDEBUGF(("SkPath1DPathEffect can't use advance <= 0\n"));
|
| + fAdvance = 0; // signals we can't draw anything
|
| + fInitialOffset = 0;
|
| + fStyle = kStyleCount;
|
| } else {
|
| - if (phase > advance) {
|
| - phase = SkScalarMod(phase, advance);
|
| - }
|
| - phase = advance - phase;
|
| - }
|
| - // now catch the edge case where phase == advance (within epsilon)
|
| - if (phase >= advance) {
|
| - phase = 0;
|
| - }
|
| - SkASSERT(phase >= 0);
|
| -
|
| - fAdvance = advance;
|
| - fInitialOffset = phase;
|
| -
|
| - if ((unsigned)style > kMorph_Style) {
|
| - SkDEBUGF(("SkPath1DPathEffect style enum out of range %d\n", style));
|
| - }
|
| - fStyle = style;
|
| + // cleanup their phase parameter, inverting it so that it becomes an
|
| + // offset along the path (to match the interpretation in PostScript)
|
| + if (phase < 0) {
|
| + phase = -phase;
|
| + if (phase > advance) {
|
| + phase = SkScalarMod(phase, advance);
|
| + }
|
| + } else {
|
| + if (phase > advance) {
|
| + phase = SkScalarMod(phase, advance);
|
| + }
|
| + phase = advance - phase;
|
| + }
|
| + // now catch the edge case where phase == advance (within epsilon)
|
| + if (phase >= advance) {
|
| + phase = 0;
|
| + }
|
| + SkASSERT(phase >= 0);
|
| +
|
| + fAdvance = advance;
|
| + fInitialOffset = phase;
|
| +
|
| + if ((unsigned)style >= kStyleCount) {
|
| + SkDEBUGF(("SkPath1DPathEffect style enum out of range %d\n", style));
|
| + }
|
| + fStyle = style;
|
| + }
|
| }
|
|
|
| bool SkPath1DPathEffect::filterPath(SkPath* dst, const SkPath& src,
|
| @@ -201,13 +207,3 @@
|
| str->appendf(")");
|
| }
|
| #endif
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////////////////////////
|
| -
|
| -SkPathEffect* SkPath1DPathEffect::Create(const SkPath& path, SkScalar advance, SkScalar phase,
|
| - Style style) {
|
| - if (advance <= 0 || path.isEmpty()) {
|
| - return nullptr;
|
| - }
|
| - return new SkPath1DPathEffect(path, advance, phase, style);
|
| -}
|
|
|