From 0dc4dd6dda9a7912f696b46d9c02155ec1d1ba5f Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 24 Mar 2015 13:55:33 -0700 Subject: Revert of pathops version two (patchset #16 id:150001 of https://codereview.chromium.org/1002693002/) Reason for revert: ASAN investigation Original issue's description: > pathops version two > > R=reed@google.com > > marked 'no commit' to attempt to get trybots to run > > TBR=reed@google.com > > Committed: https://skia.googlesource.com/skia/+/ccec0f958ffc71a9986d236bc2eb335cb2111119 TBR=caryclark@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1029993002 --- tests/PathOpsQuadIntersectionTestData.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/PathOpsQuadIntersectionTestData.cpp') diff --git a/tests/PathOpsQuadIntersectionTestData.cpp b/tests/PathOpsQuadIntersectionTestData.cpp index f51f9518bd..0706efcf45 100644 --- a/tests/PathOpsQuadIntersectionTestData.cpp +++ b/tests/PathOpsQuadIntersectionTestData.cpp @@ -44,10 +44,10 @@ const SkDQuad quadraticLines[] = { const size_t quadraticLines_count = SK_ARRAY_COUNT(quadraticLines); -static const double F = FLT_EPSILON * 32; -static const double H = FLT_EPSILON * 32; -static const double J = FLT_EPSILON * 32; -static const double K = FLT_EPSILON * 32; // INVESTIGATE: why are larger multiples necessary? +static const double F = FLT_EPSILON * 3; +static const double H = FLT_EPSILON * 4; +static const double J = FLT_EPSILON * 5; +static const double K = FLT_EPSILON * 8; // INVESTIGATE: why are larger multiples necessary? const SkDQuad quadraticModEpsilonLines[] = { {{{0, F}, {0, 0}, {1, 0}}}, @@ -64,7 +64,7 @@ const SkDQuad quadraticModEpsilonLines[] = { {{{1, 1+J}, {2, 2}, {3, 3}}}, {{{1, 1}, {3, 3}, {3+F, 3}}}, {{{1, 1}, {1+F, 1}, {2, 2}}}, - {{{1, 1}, {2, 2}, {1, 1+K}}}, + {{{1, 1}, {2, 2}, {1, 1+F}}}, {{{1, 1}, {1, 1+F}, {3, 3}}}, {{{1+H, 1}, {2, 2}, {4, 4}}}, // no coincident {{{1, 1+K}, {3, 3}, {4, 4}}}, -- cgit v1.2.3