diff options
author | 2014-04-10 22:36:34 +0000 | |
---|---|---|
committer | 2014-04-10 22:36:34 +0000 | |
commit | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 (patch) | |
tree | f1cbb4b5a361fee8c24f685c01953dc06cee4ed6 /gm/bitmappremul.cpp | |
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 'gm/bitmappremul.cpp')
-rw-r--r-- | gm/bitmappremul.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/bitmappremul.cpp b/gm/bitmappremul.cpp index e315fafdde..fd563eb775 100644 --- a/gm/bitmappremul.cpp +++ b/gm/bitmappremul.cpp @@ -30,7 +30,7 @@ static void init_bitmap(SkColorType ct, SkBitmap* bitmap) { static SkBitmap make_argb8888_gradient() { SkBitmap bitmap; - init_bitmap(kN32_SkColorType, &bitmap); + init_bitmap(kPMColor_SkColorType, &bitmap); uint8_t rowColor = 0; for (int y = 0; y < SLIDE_SIZE; y++) { uint32_t* dst = bitmap.getAddr32(0, y); @@ -64,7 +64,7 @@ static SkBitmap make_argb4444_gradient() { static SkBitmap make_argb8888_stripes() { SkBitmap bitmap; - init_bitmap(kN32_SkColorType, &bitmap); + init_bitmap(kPMColor_SkColorType, &bitmap); uint8_t rowColor = 0; for (int y = 0; y < SLIDE_SIZE; y++) { uint32_t* dst = bitmap.getAddr32(0, y); |