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/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp
index b91cb35..a677482 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -631,10 +631,10 @@
SkASSERT((endRow <= height) && "EndRow > height!");
// Clip inside the distance field to avoid overflow
- startColumn = SkTMax(startColumn, 0);
- endColumn = SkTMin(endColumn, width);
- startRow = SkTMax(startRow, 0);
- endRow = SkTMin(endRow, height);
+ startColumn = std::max(startColumn, 0);
+ endColumn = std::min(endColumn, width);
+ startRow = std::max(startRow, 0);
+ endRow = std::min(endRow, height);
// for each row in the padded bounding box
for (int row = startRow; row < endRow; ++row) {