src/pathops/SkOpContour.cpp - Issue 633393002: harden pathops for pathological test

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/pathops/SkOpContour.cpp

Issue 633393002: harden pathops for pathological test (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: exclude new test that asserts in debug Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/pathops/SkOpContour.cpp

diff --git a/src/pathops/SkOpContour.cpp b/src/pathops/SkOpContour.cpp

index 6d6ad7926ee1500faea7e266f2dbefea118d0fc2..28c072a3c1340200c2cd7f1b2514bd20b19e2c05 100644

--- a/src/pathops/SkOpContour.cpp

+++ b/src/pathops/SkOpContour.cpp

@@ -13,7 +13,7 @@ bool SkOpContour::addCoincident(int index, SkOpContour* other, int otherIndex,

const SkIntersections& ts, bool swap) {

SkPoint pt0 = ts.pt(0).asSkPoint();

SkPoint pt1 = ts.pt(1).asSkPoint();

- if (pt0 == pt1) {

+ if (pt0 == pt1 || ts[0][0] == ts[0][1] || ts[1][0] == ts[1][1]) {

// FIXME: one could imagine a case where it would be incorrect to ignore this

// suppose two self-intersecting cubics overlap to be coincident --

// this needs to check that by some measure the t values are far enough apart

« no previous file with comments | « src/pathops/SkOpContour.h ('k') | src/pathops/SkOpSegment.h » ('j') | no next file with comments »