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/SkPixmap.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/SkPixmap.cpp')
| -rw-r--r-- | src/core/SkPixmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp index 3d35ff5bb1..9bc0e23386 100644 --- a/src/core/SkPixmap.cpp +++ b/src/core/SkPixmap.cpp @@ -28,7 +28,7 @@ void SkPixmap::reset() { fInfo = SkImageInfo::MakeUnknown(); } -void SkPixmap::reset(const SkImageInfo& info, const void* addr, size_t rowBytes, SkColorTable*) { +void SkPixmap::reset(const SkImageInfo& info, const void* addr, size_t rowBytes) { if (addr) { SkASSERT(info.validRowBytes(rowBytes)); } @@ -40,7 +40,7 @@ void SkPixmap::reset(const SkImageInfo& info, const void* addr, size_t rowBytes, bool SkPixmap::reset(const SkMask& src) { if (SkMask::kA8_Format == src.fFormat) { this->reset(SkImageInfo::MakeA8(src.fBounds.width(), src.fBounds.height()), - src.fImage, src.fRowBytes, nullptr); + src.fImage, src.fRowBytes); return true; } this->reset(); @@ -86,7 +86,7 @@ bool SkPixmap::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t ds const void* srcPixels = this->addr(rec.fX, rec.fY); const SkImageInfo srcInfo = fInfo.makeWH(rec.fInfo.width(), rec.fInfo.height()); SkConvertPixels(rec.fInfo, rec.fPixels, rec.fRowBytes, srcInfo, srcPixels, this->rowBytes(), - this->ctable(), behavior); + nullptr, behavior); return true; } |