diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:36:34 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-10 22:36:34 +0000 |
| commit | 757ebd20ef284b6428eb9f4b9b69826cc3640a82 (patch) | |
| tree | f1cbb4b5a361fee8c24f685c01953dc06cee4ed6 /src/ports/SkImageDecoder_WIC.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/ports/SkImageDecoder_WIC.cpp')
| -rw-r--r-- | src/ports/SkImageDecoder_WIC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp index 74b2c39195..9d5479497e 100644 --- a/src/ports/SkImageDecoder_WIC.cpp +++ b/src/ports/SkImageDecoder_WIC.cpp @@ -306,10 +306,10 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream //Convert to 8888 if needed. const SkBitmap* bitmap; SkBitmap bitmapCopy; - if (kN32_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) { + if (kPMColor_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) { bitmap = &bitmapOrig; } else { - if (!bitmapOrig.copyTo(&bitmapCopy, kN32_SkColorType)) { + if (!bitmapOrig.copyTo(&bitmapCopy, kPMColor_SkColorType)) { return false; } bitmap = &bitmapCopy; |