commit 116b33e8ab2173f59d0244836740b42c63b29130
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

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>

samplecode/SampleStringArt.cpp

diff --git a/samplecode/SampleStringArt.cpp b/samplecode/SampleStringArt.cpp
index bda466c..2447ccb 100644
--- a/samplecode/SampleStringArt.cpp
+++ b/samplecode/SampleStringArt.cpp
@@ -32,7 +32,7 @@
         SkPath path;
         path.moveTo(center);
 
-        while (length < (SkScalarHalf(SkMinScalar(this->width(), this->height())) - 10.f))
+        while (length < (SkScalarHalf(std::min(this->width(), this->height())) - 10.f))
         {
             SkPoint rp = SkPoint::Make(length*SkScalarCos(step) + center.fX,
                                        length*SkScalarSin(step) + center.fY);