commit 788b91678fd6969b2c02b3fc6a02d1d1ab829b2c
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

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>

src/shaders/SkBitmapProcShader.cpp

diff --git a/src/shaders/SkBitmapProcShader.cpp b/src/shaders/SkBitmapProcShader.cpp
index d157a73..d630c45 100644
--- a/src/shaders/SkBitmapProcShader.cpp
+++ b/src/shaders/SkBitmapProcShader.cpp
@@ -69,7 +69,7 @@
         SkASSERT(state.fPixmap.addr());
 
         for (;;) {
-            int n = SkTMin(count, max);
+            int n = std::min(count, max);
             SkASSERT(n > 0 && n < BUF_MAX*2);
             mproc(state, buffer, n, x, y);
             sproc(state, buffer, n, dstC);