diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-07-24 12:40:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-24 17:08:55 +0000 |
| commit | 2587f41f2667b2add97f75583b71ebb74bc48af1 (patch) | |
| tree | b1e24e0b61631d780d00746f7c6483609c100452 /src/pathops/SkOpSegment.h | |
| parent | 6a4e60bb8f49e4a031e8fc99c4d8edaa25b3619f (diff) | |
handle failing pathop tests
Some tests isolated from GrShapes_arcs do not
fail gracefully, so make sure errors are properly
handled.
TBR=reed@google.com
Bug: skia:
Change-Id: Ia8c9903e64ef755ec11c398df3e5d258ca1f5f8b
Reviewed-on: https://skia-review.googlesource.com/143112
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'src/pathops/SkOpSegment.h')
| -rw-r--r-- | src/pathops/SkOpSegment.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pathops/SkOpSegment.h b/src/pathops/SkOpSegment.h index 052a220026..0b23e500c3 100644 --- a/src/pathops/SkOpSegment.h +++ b/src/pathops/SkOpSegment.h @@ -105,9 +105,9 @@ public: void calcAngles(); SkOpSpanBase::Collapsed collapsed(double startT, double endT) const; - static void ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle, + static bool ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle, SkOpAngle::IncludeType ); - static void ComputeOneSumReverse(SkOpAngle* baseAngle, SkOpAngle* nextAngle, + static bool ComputeOneSumReverse(SkOpAngle* baseAngle, SkOpAngle* nextAngle, SkOpAngle::IncludeType ); int computeSum(SkOpSpanBase* start, SkOpSpanBase* end, SkOpAngle::IncludeType includeType); @@ -279,9 +279,9 @@ public: SkOpSpanBase** lastPtr); bool markAndChaseWinding(SkOpSpanBase* start, SkOpSpanBase* end, int winding, int oppWinding, SkOpSpanBase** lastPtr); - SkOpSpanBase* markAngle(int maxWinding, int sumWinding, const SkOpAngle* angle); - SkOpSpanBase* markAngle(int maxWinding, int sumWinding, int oppMaxWinding, int oppSumWinding, - const SkOpAngle* angle); + bool markAngle(int maxWinding, int sumWinding, const SkOpAngle* angle, SkOpSpanBase** result); + bool markAngle(int maxWinding, int sumWinding, int oppMaxWinding, int oppSumWinding, + const SkOpAngle* angle, SkOpSpanBase** result); void markDone(SkOpSpan* ); bool markWinding(SkOpSpan* , int winding); bool markWinding(SkOpSpan* , int winding, int oppWinding); |