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 /src/ports | |
| 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 'src/ports')
| -rw-r--r-- | src/ports/SkImageDecoder_CG.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkImageDecoder_WIC.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp index c61ce98a8b..c683752fdd 100644 --- a/src/ports/SkImageDecoder_CG.cpp +++ b/src/ports/SkImageDecoder_CG.cpp @@ -209,7 +209,7 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm, // <Error>: CGImageDestinationFinalize image destination does not have enough images // So instead we copy to 8888. if (bm.colorType() == kARGB_4444_SkColorType) { - bm.copyTo(&bitmap8888, kPMColor_SkColorType); + bm.copyTo(&bitmap8888, kN32_SkColorType); bmPtr = &bitmap8888; } type = kUTTypePNG; diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp index 9d5479497e..74b2c39195 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 (kPMColor_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) { + if (kN32_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) { bitmap = &bitmapOrig; } else { - if (!bitmapOrig.copyTo(&bitmapCopy, kPMColor_SkColorType)) { + if (!bitmapOrig.copyTo(&bitmapCopy, kN32_SkColorType)) { return false; } bitmap = &bitmapCopy; |