diff options
| author | Leon Scroggins III <scroggo@google.com> | 2014-03-17 15:55:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-17 15:55:43 +0000 |
| commit | 96978ee290ea0ef666c49ffa8733a8c74304c9f1 (patch) | |
| tree | 4f2d7ab49e4f120705af69e42724f2b1bdb35887 /libs/hwui/TextureCache.cpp | |
| parent | adb3a198beb015ac505aecde585f0c8bca3a29e2 (diff) | |
| parent | f8d8777dddf91c741981b4f795f2fb2b1d81c1b6 (diff) | |
| download | frameworks_base-96978ee290ea0ef666c49ffa8733a8c74304c9f1.zip frameworks_base-96978ee290ea0ef666c49ffa8733a8c74304c9f1.tar.gz frameworks_base-96978ee290ea0ef666c49ffa8733a8c74304c9f1.tar.bz2 | |
am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
* commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6':
Update framework to use M33 Skia. DO NOT MERGE
Diffstat (limited to 'libs/hwui/TextureCache.cpp')
| -rw-r--r-- | libs/hwui/TextureCache.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index 54a206b..a9ab2c6 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -287,10 +287,9 @@ void TextureCache::generateTexture(SkBitmap* bitmap, Texture* texture, bool rege void TextureCache::uploadLoFiTexture(bool resize, SkBitmap* bitmap, uint32_t width, uint32_t height) { SkBitmap rgbaBitmap; - rgbaBitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height); + rgbaBitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height, 0, bitmap->alphaType()); rgbaBitmap.allocPixels(); rgbaBitmap.eraseColor(0); - rgbaBitmap.setIsOpaque(bitmap->isOpaque()); SkCanvas canvas(rgbaBitmap); canvas.drawBitmap(*bitmap, 0.0f, 0.0f, NULL); |