diff options
author | caryclark <caryclark@google.com> | 2015-05-14 05:45:54 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-14 05:45:54 -0700 |
commit | 182b499cd75c971f85cdf52c1827b3c220cc9011 (patch) | |
tree | 70d3a7884731de198bf99afb0914cb390639c420 /src/pathops/SkOpCoincidence.cpp | |
parent | eea2ff72014d985166e8c2aab3537bd32591900a (diff) |
look for deleted pts when detecting line/curve coincident edges
TBR=reed@google.com
BUG=skia:3651
Review URL: https://codereview.chromium.org/1129863007
Diffstat (limited to 'src/pathops/SkOpCoincidence.cpp')
-rwxr-xr-x | src/pathops/SkOpCoincidence.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp index ed195641bf..eb0ccc1737 100755 --- a/src/pathops/SkOpCoincidence.cpp +++ b/src/pathops/SkOpCoincidence.cpp @@ -195,12 +195,18 @@ bool SkOpCoincidence::apply() { return true; } do { - SkOpSpanBase* end = coin->fCoinPtTEnd->span(); SkOpSpan* start = coin->fCoinPtTStart->span()->upCast(); + if (start->deleted()) { + continue; + } + SkOpSpanBase* end = coin->fCoinPtTEnd->span(); SkASSERT(start == start->starter(end)); bool flipped = coin->fFlipped; - SkOpSpanBase* oEnd = (flipped ? coin->fOppPtTStart : coin->fOppPtTEnd)->span(); SkOpSpan* oStart = (flipped ? coin->fOppPtTEnd : coin->fOppPtTStart)->span()->upCast(); + if (oStart->deleted()) { + continue; + } + SkOpSpanBase* oEnd = (flipped ? coin->fOppPtTStart : coin->fOppPtTEnd)->span(); SkASSERT(oStart == oStart->starter(oEnd)); SkOpSegment* segment = start->segment(); SkOpSegment* oSegment = oStart->segment(); |