diff options
| author |  caryclark <caryclark@google.com> | 2014-09-19 06:33:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-19 06:33:31 -0700 |
| commit | 630240d18805faf81d8e75172496ad165c2226b2 (patch) | |
| tree | 6d025f6779c443536192fd93a23ad2b74e4174c9 /src/pathops/SkOpContour.h | |
| parent | 65b48952d7253faf44feb91dfe8953295b1600d0 (diff) | |
fail early if coincidence can't be resolved
Bail out if a very large value causes coincidence resolution to
fail.
TBR=
BUG=415866
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/585913002
Diffstat (limited to 'src/pathops/SkOpContour.h')
| -rw-r--r-- | src/pathops/SkOpContour.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pathops/SkOpContour.h b/src/pathops/SkOpContour.h index d1b3cd0179..899367ab0e 100644 --- a/src/pathops/SkOpContour.h +++ b/src/pathops/SkOpContour.h @@ -114,7 +114,7 @@ public: } bool calcAngles(); - void calcCoincidentWinding(); + bool calcCoincidentWinding(); void calcPartialCoincidentWinding(); void checkDuplicates() { @@ -325,7 +325,7 @@ public: private: void alignPt(int index, SkPoint* point, int zeroPt) const; int alignT(bool swap, int tIndex, SkIntersections* ts) const; - void calcCommonCoincidentWinding(const SkCoincidence& ); + bool calcCommonCoincidentWinding(const SkCoincidence& ); void checkCoincidentPair(const SkCoincidence& oneCoin, int oneIdx, const SkCoincidence& twoCoin, int twoIdx, bool partial); void joinCoincidence(const SkTArray<SkCoincidence, true>& , bool partial); |