diff options
author | 2014-04-10 22:36:34 +0000 | |
---|---|---|
committer | 2014-04-10 22:36:34 +0000 | |
commit | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 (patch) | |
tree | f1cbb4b5a361fee8c24f685c01953dc06cee4ed6 /include/core/SkImageInfo.h | |
parent | 4770a3b7a290ee5e44662b8dfbc0bc9196f00930 (diff) |
Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
breaking the Chrome deps roll.
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117
R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384
Author: bensong@google.com
Review URL: https://codereview.chromium.org/234243002
git-svn-id: http://skia.googlecode.com/svn/trunk@14144 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkImageInfo.h')
-rw-r--r-- | include/core/SkImageInfo.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index 83919549d5..1c73d959af 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -80,16 +80,12 @@ enum SkColorType { kLastEnum_SkColorType = kIndex_8_SkColorType, #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) - kN32_SkColorType = kBGRA_8888_SkColorType, + kPMColor_SkColorType = kBGRA_8888_SkColorType #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - kN32_SkColorType = kRGBA_8888_SkColorType, + kPMColor_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) { @@ -140,7 +136,7 @@ struct SkImageInfo { */ static SkImageInfo MakeN32(int width, int height, SkAlphaType at) { SkImageInfo info = { - width, height, kN32_SkColorType, at + width, height, kPMColor_SkColorType, at }; return info; } @@ -150,7 +146,7 @@ struct SkImageInfo { */ static SkImageInfo MakeN32Premul(int width, int height) { SkImageInfo info = { - width, height, kN32_SkColorType, kPremul_SkAlphaType + width, height, kPMColor_SkColorType, kPremul_SkAlphaType }; return info; } |