Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2198)

Unified Diff: src/core/SkGeometry.cpp

Issue 931663004: Remove SK_SUPPORT_LEGACY_CONIC_COMPUTE_QUAD_POW2 (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkGeometry.cpp
diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp
index 1ea03c7d6b287a395fee212a7a2b3204f6f289a7..5331bb7e5a2c2469c62ca9cc570f43d3b3914bda 100644
--- a/src/core/SkGeometry.cpp
+++ b/src/core/SkGeometry.cpp
@@ -1449,15 +1449,6 @@ int SkConic::computeQuadPOW2(SkScalar tol) const {
AS_QUAD_ERROR_SETUP
-#ifdef SK_SUPPORT_LEGACY_CONIC_COMPUTE_QUAD_POW2
- SkScalar error = SkScalarSqrt(x * x + y * y) - tol;
-
- if (error <= 0) {
- return 0;
- }
- uint32_t ierr = (uint32_t)error;
- return (34 - SkCLZ(ierr)) >> 1;
-#else
SkScalar error = SkScalarSqrt(x * x + y * y);
int pow2;
for (pow2 = 0; pow2 < kMaxConicToQuadPOW2; ++pow2) {
@@ -1484,7 +1475,6 @@ int SkConic::computeQuadPOW2(SkScalar tol) const {
pow2 = altPow2;
}
return pow2;
-#endif
}
static SkPoint* subdivide(const SkConic& src, SkPoint pts[], int level) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698