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/gpu | |
| 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/gpu')
| -rw-r--r-- | src/gpu/SkGr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index c053e8b811..94e4c8c35d 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -155,7 +155,7 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx, return result; } } else { - origBitmap.copyTo(&tmpBitmap, SkBitmap::kARGB_8888_Config); + origBitmap.copyTo(&tmpBitmap, kPMColor_SkColorType); // now bitmap points to our temp, which has been promoted to 32bits bitmap = &tmpBitmap; desc.fConfig = SkBitmapConfig2GrPixelConfig(bitmap->config()); |