diff options
| -rw-r--r-- | bench/PathBench.cpp | 2 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 1 | ||||
| -rw-r--r-- | src/core/SkGeometry.cpp | 2 | ||||
| -rw-r--r-- | tests/PathTest.cpp | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp index ad9ca1d967..6fd075945b 100644 --- a/bench/PathBench.cpp +++ b/bench/PathBench.cpp @@ -745,7 +745,7 @@ protected: add_corner_arc(path, r, xCorner, yCorner, 180); path->close(); -#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX +#ifndef SK_IGNORE_CONVEX_QUAD_OPT SkASSERT(path->isConvex()); #endif } diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index ff4caf8863..d61cc94169 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -4,7 +4,6 @@ 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', # 'SK_SUPPORT_HINTING_SCALE_FACTOR', - 'SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX', ], 'conditions' : [ ['skia_gpu == 1', diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp index 137cd795c1..3114ccb34d 100644 --- a/src/core/SkGeometry.cpp +++ b/src/core/SkGeometry.cpp @@ -1267,7 +1267,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 -#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX +#ifndef SK_IGNORE_CONVEX_QUAD_OPT #define SK_ScalarRoot2Over2_QuadCircle 0.7072f #else #define SK_ScalarRoot2Over2_QuadCircle SK_ScalarRoot2Over2 diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index 5079b7e17c..d4442cb594 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -308,7 +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); -#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX +#ifndef SK_IGNORE_CONVEX_QUAD_OPT REPORTER_ASSERT(reporter, temp.isConvex()); #endif } @@ -337,7 +337,7 @@ static void test_arb_zero_rad_round_rect_is_rect(skiatest::Reporter* reporter) { make_arb_round_rect(&temp, r, 0, 0); -#ifdef SK_REDEFINE_ROOT2OVER2_TO_MAKE_ARCTOS_CONVEX +#ifndef SK_IGNORE_CONVEX_QUAD_OPT SkRect result; REPORTER_ASSERT(reporter, temp.isRect(&result)); REPORTER_ASSERT(reporter, r == result); |