| commit | 116b33e8ab2173f59d0244836740b42c63b29130 | [log] [tgz] |
|---|---|---|
| author | Brian Osman <brianosman@google.com> | Wed Feb 05 13:34:09 2020 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Thu Feb 06 15:43:22 2020 +0000 |
| tree | 48fec46486321ba8fdcda71586d5d6bd49f4c79e | |
| parent | febdedfa446298a38e4ebbf6c2315f114e09370f [diff] [blame] |
Remove SkMaxScalar and SkMinScalar Use std::max and std::min instead Change-Id: Icf3796609e5cb511687fb50bd31229ae4b6b9b39 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268841 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index 31dc1d4..7298a95 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp
@@ -39,7 +39,7 @@ SkPoint pt = { wScalar / 2, hScalar / 2 }; - SkScalar radius = 3 * SkMaxScalar(wScalar, hScalar); + SkScalar radius = 3 * std::max(wScalar, hScalar); SkColor colors[] = {SK_ColorDKGRAY, ToolUtils::color_to_565(0xFF222255),