diff options
Diffstat (limited to 'src/pathops')
| -rwxr-xr-x | src/pathops/SkOpCoincidence.cpp | 1 | ||||
| -rw-r--r-- | src/pathops/SkOpCoincidence.h | 2 | ||||
| -rwxr-xr-x | src/pathops/SkOpSpan.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp index 446f34cb26..1bbb82a9e0 100755 --- a/src/pathops/SkOpCoincidence.cpp +++ b/src/pathops/SkOpCoincidence.cpp @@ -461,6 +461,7 @@ bool SkOpCoincidence::addExpanded() { FAIL_IF(oEnd->deleted()); FAIL_IF(!start->upCastable()); const SkOpSpanBase* test = start->upCast()->next(); + FAIL_IF(!coin->flipped() && !oStart->upCastable()); const SkOpSpanBase* oTest = coin->flipped() ? oStart->prev() : oStart->upCast()->next(); FAIL_IF(!oTest); SkOpSegment* seg = start->segment(); diff --git a/src/pathops/SkOpCoincidence.h b/src/pathops/SkOpCoincidence.h index fbd6686d64..320d9aedc4 100644 --- a/src/pathops/SkOpCoincidence.h +++ b/src/pathops/SkOpCoincidence.h @@ -95,7 +95,7 @@ public: void setOppPtTEnd(const SkOpPtT* ptT) { SkOPASSERT(ptT == ptT->span()->ptT()); - SkASSERT(!fOppPtTStart || ptT->fT != fOppPtTStart->fT); + SkOPASSERT(!fOppPtTStart || ptT->fT != fOppPtTStart->fT); SkASSERT(!fOppPtTStart || fOppPtTStart->segment() == ptT->segment()); fOppPtTEnd = ptT; ptT->setCoincident(); diff --git a/src/pathops/SkOpSpan.cpp b/src/pathops/SkOpSpan.cpp index 0c47b685f0..2b85b7103b 100755 --- a/src/pathops/SkOpSpan.cpp +++ b/src/pathops/SkOpSpan.cpp @@ -39,7 +39,7 @@ bool SkOpPtT::collapsed(const SkOpPtT* check) const { } bool SkOpPtT::contains(const SkOpPtT* check) const { - SkASSERT(this != check); + SkOPASSERT(this != check); const SkOpPtT* ptT = this; const SkOpPtT* stopPtT = ptT; while ((ptT = ptT->next()) != stopPtT) { |