diff options
| author |  Mike Reed <reed@google.com> | 2017-07-18 10:53:11 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-18 15:50:43 +0000 |
| commit | 086a427b0cee3862f25c492fc5082ff24105dc53 (patch) | |
| tree | 79d4311c12309e5bc34950a0131771d3cb8f6171 /src/core/SkBitmapDevice.cpp | |
| parent | 918ad9d5f19efdbd57486b8f931f7af197896010 (diff) | |
guard references to SkColorTable
Bug: skia:6828
Change-Id: I0c8c78e70b118f51cb59dc45675e4ddcd4776108
Reviewed-on: https://skia-review.googlesource.com/24260
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/core/SkBitmapDevice.cpp')
| -rw-r--r-- | src/core/SkBitmapDevice.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp index 28278a918d..defe82433a 100644 --- a/src/core/SkBitmapDevice.cpp +++ b/src/core/SkBitmapDevice.cpp @@ -121,7 +121,7 @@ SkBitmapDevice* SkBitmapDevice::Create(const SkImageInfo& origInfo, } else { // This bitmap has transparency, so we'll zero the pixels (to transparent). // We use the flag as a faster alloc-then-eraseColor(SK_ColorTRANSPARENT). - if (!bitmap.tryAllocPixels(info, nullptr/*colortable*/, SkBitmap::kZeroPixels_AllocFlag)) { + if (!bitmap.tryAllocPixelsFlags(info, SkBitmap::kZeroPixels_AllocFlag)) { return nullptr; } } @@ -152,8 +152,7 @@ bool SkBitmapDevice::onAccessPixels(SkPixmap* pmap) { bool SkBitmapDevice::onPeekPixels(SkPixmap* pmap) { const SkImageInfo info = fBitmap.info(); if (fBitmap.getPixels() && (kUnknown_SkColorType != info.colorType())) { - SkColorTable* ctable = nullptr; - pmap->reset(fBitmap.info(), fBitmap.getPixels(), fBitmap.rowBytes(), ctable); + pmap->reset(fBitmap.info(), fBitmap.getPixels(), fBitmap.rowBytes()); return true; } return false; |