diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-23 03:59:35 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-23 03:59:35 +0000 |
| commit | 8a2ad3cae710f05cca57e48dd1732d575dba2dc7 (patch) | |
| tree | 65d3463543af4bc3d330de2bef37cffc6d10395e /src/ports/SkImageDecoder_CG.cpp | |
| parent | d5b294acad96ffa3ccb5c56f6290036922f76907 (diff) | |
add new copyTo version to SkBitmap, which takes SkColorType
BUG=skia:
R=scroggo@google.com, halcanary@google.com, bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/171723007
git-svn-id: http://skia.googlecode.com/svn/trunk@13553 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkImageDecoder_CG.cpp')
| -rw-r--r-- | src/ports/SkImageDecoder_CG.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp index 90c282dc9b..c61ce98a8b 100644 --- a/src/ports/SkImageDecoder_CG.cpp +++ b/src/ports/SkImageDecoder_CG.cpp @@ -208,8 +208,8 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm, // format. // <Error>: CGImageDestinationFinalize image destination does not have enough images // So instead we copy to 8888. - if (bm.config() == SkBitmap::kARGB_4444_Config) { - bm.copyTo(&bitmap8888, SkBitmap::kARGB_8888_Config); + if (bm.colorType() == kARGB_4444_SkColorType) { + bm.copyTo(&bitmap8888, kPMColor_SkColorType); bmPtr = &bitmap8888; } type = kUTTypePNG; |