diff options
| -rw-r--r-- | bench/PathBench.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkGeometry.cpp | 7 | ||||
| -rw-r--r-- | tests/PathTest.cpp | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp index 697acd4954..b0794f6c02 100644 --- a/bench/PathBench.cpp +++ b/bench/PathBench.cpp @@ -745,9 +745,7 @@ protected: add_corner_arc(path, r, xCorner, yCorner, 180); path->close(); -#ifndef SK_IGNORE_CONVEX_QUAD_OPT SkASSERT(path->isConvex()); -#endif } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp index 1ca40befa1..0d4a9c79d1 100644 --- a/src/core/SkGeometry.cpp +++ b/src/core/SkGeometry.cpp @@ -1255,6 +1255,7 @@ static bool quad_pt2OffCurve(const SkPoint quad[3], SkScalar x, SkScalar y, SkPo } #ifdef SK_SCALAR_IS_FLOAT + // Due to floating point issues (i.e., 1.0f - SK_ScalarRoot2Over2 != // SK_ScalarRoot2Over2 - SK_ScalarTanPIOver8) a cruder root2over2 // approximation is required to make the quad circle points convex. The @@ -1267,11 +1268,7 @@ static bool quad_pt2OffCurve(const SkPoint quad[3], SkScalar x, SkScalar y, SkPo // Switch over to using cubics rather then quads // Use a different method to create the mid-point (e.g., compute // the two side points, average them, then move it out as needed -#ifndef SK_IGNORE_CONVEX_QUAD_OPT - #define SK_ScalarRoot2Over2_QuadCircle 0.7072f -#else - #define SK_ScalarRoot2Over2_QuadCircle SK_ScalarRoot2Over2 -#endif +#define SK_ScalarRoot2Over2_QuadCircle 0.7072f #else #define SK_ScalarRoot2Over2_QuadCircle SK_FixedRoot2Over2 diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index d4442cb594..17144814b4 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -308,9 +308,7 @@ static void test_arb_round_rect_is_convex(skiatest::Reporter* reporter) { make_arb_round_rect(&temp, r, r.width() / 10, r.height() / 15); -#ifndef SK_IGNORE_CONVEX_QUAD_OPT REPORTER_ASSERT(reporter, temp.isConvex()); -#endif } } @@ -337,11 +335,9 @@ static void test_arb_zero_rad_round_rect_is_rect(skiatest::Reporter* reporter) { make_arb_round_rect(&temp, r, 0, 0); -#ifndef SK_IGNORE_CONVEX_QUAD_OPT SkRect result; REPORTER_ASSERT(reporter, temp.isRect(&result)); REPORTER_ASSERT(reporter, r == result); -#endif } } |