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

Unified Diff: src/pathops/SkOpContour.h

Issue 23542056: path ops work in progress (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: verbose + mutex around file number access Created 7 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 | « src/pathops/SkOpAngle.cpp ('k') | src/pathops/SkOpContour.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpContour.h
diff --git a/src/pathops/SkOpContour.h b/src/pathops/SkOpContour.h
index a5635fe3d2b59b083dcb5801df931fa71de103ac..a4ec6d398f04bdbab27a11bc0867bbc55be657d3 100644
--- a/src/pathops/SkOpContour.h
+++ b/src/pathops/SkOpContour.h
@@ -36,7 +36,7 @@ public:
: fBounds.fTop < rh.fBounds.fTop;
}
- void addCoincident(int index, SkOpContour* other, int otherIndex,
+ bool addCoincident(int index, SkOpContour* other, int otherIndex,
const SkIntersections& ts, bool swap);
void addCoincidentPoints();
@@ -63,7 +63,7 @@ public:
fSegments[segIndex].addOtherT(tIndex, otherT, otherIndex);
}
- void addPartialCoincident(int index, SkOpContour* other, int otherIndex,
+ bool addPartialCoincident(int index, SkOpContour* other, int otherIndex,
const SkIntersections& ts, int ptIndex, bool swap);
int addQuad(const SkPoint pts[3]) {
@@ -100,6 +100,9 @@ public:
if (segment->verb() == SkPath::kLine_Verb) {
continue;
}
+ if (segment->done()) {
+ continue; // likely coincident, nothing to do
+ }
segment->checkEnds();
}
}
« no previous file with comments | « src/pathops/SkOpAngle.cpp ('k') | src/pathops/SkOpContour.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698