diff options
| author |  Mike Reed <reed@google.com> | 2017-07-12 22:10:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-13 10:44:42 +0000 |
| commit | 580501382fb1418fff7acc63680f3a9a6bf3938c (patch) | |
| tree | 16a93a72852e282b1f520dcc947985e2190a45bf /src/core/SkBitmap.cpp | |
| parent | 4d41b8f2fdae21a6ed16fca6242d53e7c08349d0 (diff) | |
Guard to remove kIndex_8_SkColorType
Bug: skia:6828
Change-Id: Ia942a36abb18213184f8d436555a658270d97d47
Reviewed-on: https://skia-review.googlesource.com/22721
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'src/core/SkBitmap.cpp')
| -rw-r--r-- | src/core/SkBitmap.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index e88fa5ec57..8f8d70f525 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -242,9 +242,11 @@ bool SkBitmap::tryAllocPixels(Allocator* allocator, SkColorTable* ctable) { /////////////////////////////////////////////////////////////////////////////// bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, size_t rowBytes) { +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE if (kIndex_8_SkColorType == requestedInfo.colorType()) { return reset_return_false(this); } +#endif if (!this->setInfo(requestedInfo, rowBytes)) { return reset_return_false(this); } @@ -268,9 +270,11 @@ bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, size_t rowBytes) bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, sk_sp<SkColorTable> ctable, uint32_t allocFlags) { +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE if (kIndex_8_SkColorType == requestedInfo.colorType() && nullptr == ctable) { return reset_return_false(this); } +#endif if (!this->setInfo(requestedInfo)) { return reset_return_false(this); } @@ -428,7 +432,9 @@ void* SkBitmap::getAddr(int x, int y) const { base += x << 1; break; case kAlpha_8_SkColorType: +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE case kIndex_8_SkColorType: +#endif case kGray_8_SkColorType: base += x; break; @@ -449,7 +455,9 @@ void SkBitmap::erase(SkColor c, const SkIRect& area) const { switch (fInfo.colorType()) { case kUnknown_SkColorType: +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE case kIndex_8_SkColorType: +#endif // TODO: can we ASSERT that we never get here? return; // can't erase. Should we bzero so the memory is not uninitialized? default: @@ -651,11 +659,14 @@ static void write_raw_pixels(SkWriteBuffer* buffer, const SkPixmap& pmap) { } buffer->writeByteArray(storage.get(), size); +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE const SkColorTable* ct = pmap.ctable(); if (kIndex_8_SkColorType == info.colorType() && ct) { buffer->writeBool(true); ct->writeToBuffer(*buffer); - } else { + } else +#endif + { buffer->writeBool(false); } } |