diff options
author | Cary Clark <caryclark@skia.org> | 2018-04-24 14:47:16 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-24 19:19:01 +0000 |
commit | 6cdb7d3a4ca932d1564ffea1602d5c39c5e046a2 (patch) | |
tree | 59bde1b72f8317024053f25ea43c8d4c4c41d8cd /src/effects | |
parent | fb20ac4578582f31b807d3c27be46b0102c048cc (diff) |
prepare to remove obsolete macros
SkColorSetARGBMacro and SkColorSetARGBInline
are macros which will be deleted. Replace them
with a standard equivalent.
R=scroggo@google.com
Bug: skia:6898
Change-Id: I16e010776e991c19a375d0686ecd1b1cc4c59a9b
Reviewed-on: https://skia-review.googlesource.com/123501
Auto-Submit: Cary Clark <caryclark@skia.org>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/effects')
-rw-r--r-- | src/effects/SkLightingImageFilter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index a55b3e37dc..0a1330583a 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -824,10 +824,9 @@ class GrGLLight; /////////////////////////////////////////////////////////////////////////////// static SkColor xform_color(const SkPoint3& color, SkColorSpaceXformer* xformer) { - SkColor origColor = SkColorSetARGBInline(0xFF, - SkScalarRoundToInt(color.fX), - SkScalarRoundToInt(color.fY), - SkScalarRoundToInt(color.fZ)); + SkColor origColor = SkColorSetRGB(SkScalarRoundToInt(color.fX), + SkScalarRoundToInt(color.fY), + SkScalarRoundToInt(color.fZ)); return xformer->apply(origColor); } |