diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 20:45:29 +0000 |
| commit | 149e9a107c356b0151433fb23c2b1c8d0634947c (patch) | |
| tree | 7db3bbc9bba71665f1d0c2720c98682afcda2bda /include/core/SkImageInfo.h | |
| parent | 2a6f221bf8cea98bd7b44b02ce5c13a6b334a70d (diff) | |
Rename kPMColor_SkColorType to kN32_SkColorType.
The new name better represents what this flag means.
BUG=skia:2384
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/227433009
git-svn-id: http://skia.googlecode.com/svn/trunk@14117 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkImageInfo.h')
| -rw-r--r-- | include/core/SkImageInfo.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index 1c73d959af..83919549d5 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -80,12 +80,16 @@ enum SkColorType { kLastEnum_SkColorType = kIndex_8_SkColorType, #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) - kPMColor_SkColorType = kBGRA_8888_SkColorType + kN32_SkColorType = kBGRA_8888_SkColorType, #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - kPMColor_SkColorType = kRGBA_8888_SkColorType + kN32_SkColorType = kRGBA_8888_SkColorType, #else #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order" #endif + +#ifdef SK_SUPPORT_LEGACY_N32_NAME + kPMColor_SkColorType = kN32_SkColorType +#endif }; static int SkColorTypeBytesPerPixel(SkColorType ct) { @@ -136,7 +140,7 @@ struct SkImageInfo { */ static SkImageInfo MakeN32(int width, int height, SkAlphaType at) { SkImageInfo info = { - width, height, kPMColor_SkColorType, at + width, height, kN32_SkColorType, at }; return info; } @@ -146,7 +150,7 @@ struct SkImageInfo { */ static SkImageInfo MakeN32Premul(int width, int height) { SkImageInfo info = { - width, height, kPMColor_SkColorType, kPremul_SkAlphaType + width, height, kN32_SkColorType, kPremul_SkAlphaType }; return info; } |