commit aba642c6acd4a319a490cdeea1c25d14c17c1d6c
author Brian Osman <brianosman@google.com> Thu Feb 06 12:52:25 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 06 18:29:51 2020 +0000
tree 7242637d1344e159165acdfe9011df38859f17b9
parent 7f36405ea3eccc0954921159882b25435bdabe26

Remove SkScalarClampMax and SkScalarPin

Change-Id: Ic96a0ea2cd1bfd59ee3f236543e1d6dd102544ec
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269142
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/utils/SkPatchUtils.cpp

diff --git a/src/utils/SkPatchUtils.cpp b/src/utils/SkPatchUtils.cpp
index e905bf7..1c6c2ac 100644
--- a/src/utils/SkPatchUtils.cpp
+++ b/src/utils/SkPatchUtils.cpp
@@ -357,9 +357,9 @@
                 indices[i + 4] = indices[i + 2];
                 indices[i + 5] = (x + 1) * stride + y;
             }
-            v = SkScalarClampMax(v + 1.f / lodY, 1);
+            v = SkTPin(v + 1.f / lodY, 0.0f, 1.0f);
         }
-        u = SkScalarClampMax(u + 1.f / lodX, 1);
+        u = SkTPin(u + 1.f / lodX, 0.0f, 1.0f);
     }
 
     if (tmpColors) {