| commit | 60b5dce19984a5165f6b2f1d6d477f5e8a940761 | [log] [tgz] |
|---|---|---|
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Apr 22 20:24:33 2014 +0000 |
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Apr 22 20:24:33 2014 +0000 |
| tree | b54e4d9df7b9b1e03307be9f5043b0be92df6a2f | |
| parent | 945ec3a2bec668ca845071a65df8ec55e8f43819 [diff] [blame] |
expose CGImage -> SkBitmap BUG=skia: R=scroggo@google.com, halcanary@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/243463005 git-svn-id: http://skia.googlecode.com/svn/trunk@14315 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 2a8c8e4..d19e9ca 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp
@@ -997,7 +997,8 @@ switch (dstColorType) { case kAlpha_8_SkColorType: case kRGB_565_SkColorType: - case kN32_SkColorType: + case kRGBA_8888_SkColorType: + case kBGRA_8888_SkColorType: break; case kIndex_8_SkColorType: if (!sameConfigs) {