diff options
Diffstat (limited to 'chromium/third_party/skia/src/pathops/SkQuarticRoot.cpp')
| -rw-r--r-- | chromium/third_party/skia/src/pathops/SkQuarticRoot.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/third_party/skia/src/pathops/SkQuarticRoot.cpp b/chromium/third_party/skia/src/pathops/SkQuarticRoot.cpp index e5b486c76c0..f9a7bf51799 100644 --- a/chromium/third_party/skia/src/pathops/SkQuarticRoot.cpp +++ b/chromium/third_party/skia/src/pathops/SkQuarticRoot.cpp @@ -71,7 +71,9 @@ int SkReducedQuarticRoots(const double t4, const double t3, const double t2, con return num; } if (oneHint) { - SkASSERT(approximately_zero_double(t4 + t3 + t2 + t1 + t0)); // 1 is one root + SkASSERT(approximately_zero_double(t4 + t3 + t2 + t1 + t0) || + approximately_zero_when_compared_to(t4 + t3 + t2 + t1 + t0, // 1 is one root + SkTMax(fabs(t4), SkTMax(fabs(t3), SkTMax(fabs(t2), SkTMax(fabs(t1), fabs(t0))))))); // note that -C == A + B + D + E int num = SkDCubic::RootsReal(t4, t4 + t3, -(t1 + t0), -t0, roots); for (int i = 0; i < num; ++i) { @@ -101,7 +103,8 @@ int SkQuarticRootsReal(int firstCubicRoot, const double A, const double B, const const double q = a2 * a / 8 - a * b / 2 + c; const double r = -3 * a2 * a2 / 256 + a2 * b / 16 - a * c / 4 + d; int num; - if (approximately_zero(r)) { + double largest = SkTMax(fabs(p), fabs(q)); + if (approximately_zero_when_compared_to(r, largest)) { /* no absolute term: y(y^3 + py + q) = 0 */ num = SkDCubic::RootsReal(1, 0, p, q, s); s[num++] = 0; |