From 70039d8c96085001ac59ff28c4bde476c8fd30cf Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 28 Jul 2018 17:12:35 +1000 Subject: Remove SkFastMin32 SkFastMin32 has been the same as SkMin32 since commit 38bad32cf52 "fold SK_CPU_HAS_CONDITION_INSTR through as always defined" was submitted in July 2013 as per https://chromiumcodereview.appspot.com/21122005 TBR=hcm@google.com The only change to the public API is removing a redundant helper from SkTypes.h Bug: skia: Change-Id: Ic6f7c7dc5612e8b7b1be3923f572ffcc13555d75 Reviewed-on: https://skia-review.googlesource.com/144242 Commit-Queue: Leon Scroggins Reviewed-by: Leon Scroggins --- src/core/SkBlitter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/SkBlitter.cpp') diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index 7a45981b80..52c2370ae7 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -822,9 +822,9 @@ public: unsigned mul = SkAlpha255To256(mulp[i]); unsigned add = addp[i]; - r = SkFastMin32(SkAlphaMul(r, mul) + add, a); - g = SkFastMin32(SkAlphaMul(g, mul) + add, a); - b = SkFastMin32(SkAlphaMul(b, mul) + add, a); + r = SkMin32(SkAlphaMul(r, mul) + add, a); + g = SkMin32(SkAlphaMul(g, mul) + add, a); + b = SkMin32(SkAlphaMul(b, mul) + add, a); span[i] = SkPackARGB32(a, r, g, b); } @@ -843,9 +843,9 @@ public: unsigned add = addp[i]; span[i] = SkPackARGB32( a, - SkFastMin32(SkAlphaMul(r, mul) + add, a), - SkFastMin32(SkAlphaMul(g, mul) + add, a), - SkFastMin32(SkAlphaMul(b, mul) + add, a)); + SkMin32(SkAlphaMul(r, mul) + add, a), + SkMin32(SkAlphaMul(g, mul) + add, a), + SkMin32(SkAlphaMul(b, mul) + add, a)); } else { span[i] = 0; } -- cgit v1.2.3