| commit | 788b91678fd6969b2c02b3fc6a02d1d1ab829b2c | [log] [tgz] |
|---|---|---|
| author | Brian Osman <brianosman@google.com> | Fri Feb 07 10:36:46 2020 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Fri Feb 07 18:40:09 2020 +0000 |
| tree | 67cd9a87637059f8ec148ca41866d34c88275628 | |
| parent | 3a17a32305c429d3b3c82d959aa16fa9433e620e [diff] [blame] |
Remove SkTMin and SkTMax Use std::min and std::max everywhere. SkTPin still exists. We can't use std::clamp yet, and even when we can, it has undefined behavior with NaN. SkTPin is written to ensure that we return a value in the [lo, hi] range. Change-Id: I506852a36e024ae405358d5078a872e2c77fa71e Docs-Preview: https://skia.org/?cl=269357 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269357 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp index 69d4d76..5b5b1d8 100644 --- a/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp +++ b/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.cpp
@@ -176,7 +176,7 @@ radius2 += offset; } } else if (type == static_cast<int>(Type::kStrip)) { - radius1 = SkTMax(radius1, .1f); // Make sure that the radius is non-zero + radius1 = std::max(radius1, .1f); // Make sure that the radius is non-zero radius2 = radius1; // Make sure that the centers are different if (SkScalarNearlyZero(SkPoint::Distance(center1, center2))) {