Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: src/pathops/SkOpAngle.h

Issue 2426753002: break ambiguous angle sorting loop (Closed)
Patch Set: fix linux warning Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/pathops_unittest.gypi ('k') | src/pathops/SkOpAngle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpAngle.h
diff --git a/src/pathops/SkOpAngle.h b/src/pathops/SkOpAngle.h
index cbdadf10398cedc64836f0619415203c731fc14a..3cebfff7175fde335d3bb6323327d7867b894753 100644
--- a/src/pathops/SkOpAngle.h
+++ b/src/pathops/SkOpAngle.h
@@ -64,7 +64,7 @@ public:
return fEnd;
}
- void insert(SkOpAngle* );
+ bool insert(SkOpAngle* );
SkOpSpanBase* lastMarked() const;
bool loopContains(const SkOpAngle* ) const;
int loopCount() const;
@@ -87,6 +87,10 @@ public:
SkOpSpan* starter();
+ bool tangentsAmbiguous() const {
+ return fTangentsAmbiguous;
+ }
+
bool unorderable() const {
return fUnorderable;
}
@@ -97,7 +101,7 @@ private:
bool checkCrossesZero() const;
bool checkParallel(SkOpAngle* );
bool computeSector();
- int convexHullOverlaps(const SkOpAngle* ) const;
+ int convexHullOverlaps(const SkOpAngle* );
bool endToSide(const SkOpAngle* rh, bool* inside) const;
bool endsIntersect(SkOpAngle* );
int findSector(SkPath::Verb verb, double x, double y) const;
@@ -109,7 +113,7 @@ private:
bool orderable(SkOpAngle* rh); // false == this < rh ; true == this > rh
void setSector();
void setSpans();
- bool tangentsDiverge(const SkOpAngle* rh, double s0xt0) const;
+ bool tangentsDiverge(const SkOpAngle* rh, double s0xt0);
SkDCurve fOriginalCurvePart; // the curve from start to end
SkDCurveSweep fPart; // the curve from start to end offset as needed
@@ -127,6 +131,7 @@ private:
bool fComputeSector;
bool fComputedSector;
bool fCheckCoincidence;
+ bool fTangentsAmbiguous;
SkDEBUGCODE(int fID);
friend class PathOpsAngleTester;
« no previous file with comments | « gyp/pathops_unittest.gypi ('k') | src/pathops/SkOpAngle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698