From dff53c26e7ef80da4767433ecfe17741a059e247 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 22 Feb 2013 14:19:58 +0000 Subject: remove obsolete build flag SK_IGNORE_CONVEX_QUAD_OPT Review URL: https://codereview.appspot.com/7363046 git-svn-id: http://skia.googlecode.com/svn/trunk@7820 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkGeometry.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src') 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 -- cgit v1.2.3