diff options
| author |  danakj <danakj@chromium.org> | 2017-05-26 18:51:41 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-26 23:14:13 +0000 |
| commit | 24f20a8639430cfb0374c91bbee8edd36a0e9877 (patch) | |
| tree | 1c9bcba1f41e99be82f16066a95234f1282e980e /include/core/SkColor.h | |
| parent | f7beee7cdd999df80801f4d4992371d121e8428a (diff) | |
Add casts for SkColor constant macros.
This ensures the compiler knows they are SkColors and not "int" which
can't be implicitly casted when you end up with a reference to it.
Bug: skia: 6696
Change-Id: Ieb6a2270d7d01df279d55e0bad7a793a8edd8658
Reviewed-on: https://skia-review.googlesource.com/18081
Commit-Queue: danakj chromium <danakj@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include/core/SkColor.h')
| -rw-r--r-- | include/core/SkColor.h | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/include/core/SkColor.h b/include/core/SkColor.h index 5ee86fbee6..9d757a9563 100644 --- a/include/core/SkColor.h +++ b/include/core/SkColor.h @@ -73,23 +73,37 @@ static constexpr inline SkColor SkColorSetA(SkColor c, U8CPU a) { // common colors -#define SK_AlphaTRANSPARENT 0x00 //!< transparent SkAlpha value -#define SK_AlphaOPAQUE 0xFF //!< opaque SkAlpha value - -#define SK_ColorTRANSPARENT 0x00000000 //!< transparent SkColor value - -#define SK_ColorBLACK 0xFF000000 //!< black SkColor value -#define SK_ColorDKGRAY 0xFF444444 //!< dark gray SkColor value -#define SK_ColorGRAY 0xFF888888 //!< gray SkColor value -#define SK_ColorLTGRAY 0xFFCCCCCC //!< light gray SkColor value -#define SK_ColorWHITE 0xFFFFFFFF //!< white SkColor value - -#define SK_ColorRED 0xFFFF0000 //!< red SkColor value -#define SK_ColorGREEN 0xFF00FF00 //!< green SkColor value -#define SK_ColorBLUE 0xFF0000FF //!< blue SkColor value -#define SK_ColorYELLOW 0xFFFFFF00 //!< yellow SkColor value -#define SK_ColorCYAN 0xFF00FFFF //!< cyan SkColor value -#define SK_ColorMAGENTA 0xFFFF00FF //!< magenta SkColor value +/** transparent SkAlpha value */ +#define SK_AlphaTRANSPARENT static_cast<SkAlpha>(0x00) +/** opaque SkAlpha value */ +#define SK_AlphaOPAQUE static_cast<SkAlpha>(0xFF) + +/** transparent SkColor value */ +#define SK_ColorTRANSPARENT static_cast<SkColor>(0x00000000) + +/** black SkColor value */ +#define SK_ColorBLACK static_cast<SkColor>(0xFF000000) +/** dark gray SkColor value */ +#define SK_ColorDKGRAY static_cast<SkColor>(0xFF444444) +/** gray SkColor value */ +#define SK_ColorGRAY static_cast<SkColor>(0xFF888888) +/** light gray SkColor value */ +#define SK_ColorLTGRAY static_cast<SkColor>(0xFFCCCCCC) +/** white SkColor value */ +#define SK_ColorWHITE static_cast<SkColor>(0xFFFFFFFF) + +/** red SkColor value */ +#define SK_ColorRED static_cast<SkColor>(0xFFFF0000) +/** green SkColor value */ +#define SK_ColorGREEN static_cast<SkColor>(0xFF00FF00) +/** blue SkColor value */ +#define SK_ColorBLUE static_cast<SkColor>(0xFF0000FF) +/** yellow SkColor value */ +#define SK_ColorYELLOW static_cast<SkColor>(0xFFFFFF00) +/** cyan SkColor value */ +#define SK_ColorCYAN static_cast<SkColor>(0xFF00FFFF) +/** magenta SkColor value */ +#define SK_ColorMAGENTA static_cast<SkColor>(0xFFFF00FF) //////////////////////////////////////////////////////////////////////// |