diff options
author | 2014-04-10 22:36:34 +0000 | |
---|---|---|
committer | 2014-04-10 22:36:34 +0000 | |
commit | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 (patch) | |
tree | f1cbb4b5a361fee8c24f685c01953dc06cee4ed6 /src/utils/SkBitmapHasher.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 'src/utils/SkBitmapHasher.cpp')
-rw-r--r-- | src/utils/SkBitmapHasher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/SkBitmapHasher.cpp b/src/utils/SkBitmapHasher.cpp index bd038ddaa0..6c861cd04b 100644 --- a/src/utils/SkBitmapHasher.cpp +++ b/src/utils/SkBitmapHasher.cpp @@ -57,7 +57,7 @@ static inline uint64_t first_8_bytes_as_uint64(const uint8_t *bytearray) { // Hmm, that didn't work. Maybe if we create a new // kARGB_8888_Config version of the bitmap it will work better? SkBitmap copyBitmap; - if (!bitmap.copyTo(©Bitmap, kN32_SkColorType)) { + if (!bitmap.copyTo(©Bitmap, kPMColor_SkColorType)) { return false; } return ComputeDigestInternal(copyBitmap, result); |