diff options
| author | 2017-04-25 17:32:34 -0400 | |
|---|---|---|
| committer | 2017-04-26 16:17:46 -0400 | |
| commit | 155d52155b67d1563d0a55f654683d98832d0860 (patch) | |
| tree | a8a312d22ca34244a27523aced9393c74ef764dc /libs/input/SpriteController.cpp | |
| parent | c2d407a7dc4ea0f402037cac548b47e95bf426a1 (diff) | |
Remove uses of SkBitmap::copyTo
This API is being deleted:
skbug.com/6464
Test: Refactor
Change-Id: Id78653ca45d6bfee2e4f9c9c24c2414b888f0df5
Diffstat (limited to 'libs/input/SpriteController.cpp')
| -rw-r--r-- | libs/input/SpriteController.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp index 8613a3b07bb5..ed31b1202863 100644 --- a/libs/input/SpriteController.cpp +++ b/libs/input/SpriteController.cpp @@ -405,7 +405,11 @@ void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) { uint32_t dirty; if (icon.isValid()) { - icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kN32_SkColorType); + SkBitmap* bitmapCopy = &mLocked.state.icon.bitmap; + if (bitmapCopy->tryAllocPixels(icon.bitmap.info().makeColorType(kN32_SkColorType))) { + icon.bitmap.readPixels(bitmapCopy->info(), bitmapCopy->getPixels(), + bitmapCopy->rowBytes(), 0, 0); + } if (!mLocked.state.icon.isValid() || mLocked.state.icon.hotSpotX != icon.hotSpotX |