diff options
| author |  caryclark <caryclark@google.com> | 2016-10-24 08:41:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-24 08:41:45 -0700 |
| commit | 595ac28c3990ea89ee40ec14117dc1667acfc126 (patch) | |
| tree | 99bd0190a4108bbce5853ff020df8cc48df16bdf /src/pathops | |
| parent | b2cf266151a6698a6c667fb97f9c8d3cbdd8b4e6 (diff) | |
fix a few more fuzzes
Minor changes to fix some fuzz conditions.
A couple of ignored asserts when the data
is fuzzy, and one fail condition when the
underlying data has already been deleted.
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2443243002
Review-Url: https://codereview.chromium.org/2443243002
Diffstat (limited to 'src/pathops')
| -rw-r--r-- | src/pathops/SkIntersections.cpp | 2 | ||||
| -rwxr-xr-x | src/pathops/SkOpCoincidence.cpp | 2 | ||||
| -rw-r--r-- | src/pathops/SkOpSpan.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/pathops/SkIntersections.cpp b/src/pathops/SkIntersections.cpp index 9683796a5b..79206c34ef 100644 --- a/src/pathops/SkIntersections.cpp +++ b/src/pathops/SkIntersections.cpp @@ -67,7 +67,7 @@ int SkIntersections::insert(double one, double two, const SkDPoint& pt) { } } if (fUsed >= fMax) { - SkASSERT(0); // FIXME : this error, if it is to be handled at runtime in release, must + SkOPASSERT(0); // FIXME : this error, if it is to be handled at runtime in release, must // be propagated all the way back down to the caller, and return failure. fUsed = 0; return 0; diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp index 1390533a51..dadcfa520b 100755 --- a/src/pathops/SkOpCoincidence.cpp +++ b/src/pathops/SkOpCoincidence.cpp @@ -794,7 +794,7 @@ bool SkOpCoincidence::addMissing(bool* added DEBUG_COIN_DECLARE_PARAMS()) { return true; } const SkOpPtT* ice = inner->coinPtTEnd(); - SkASSERT(!ice->deleted()); + FAIL_IF(ice->deleted()); if (outerOpp != innerOpp && this->overlap(ocs, oce, ics, ice, &overS, &overE)) { (void) this->addIfMissing(ocs->starter(oce), ics->starter(ice), overS, overE, outerOppWritable, innerOppWritable, added diff --git a/src/pathops/SkOpSpan.h b/src/pathops/SkOpSpan.h index 023e7acfbe..219020a575 100644 --- a/src/pathops/SkOpSpan.h +++ b/src/pathops/SkOpSpan.h @@ -518,7 +518,7 @@ public: void setOppValue(int oppValue) { SkASSERT(!final()); SkASSERT(fOppSum == SK_MinS32); - SkASSERT(!oppValue || !fDone); + SkOPASSERT(!oppValue || !fDone); fOppValue = oppValue; } |