diff options
| author |  Mike Reed <reed@google.com> | 2017-07-17 10:13:58 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-17 20:37:28 +0000 |
| commit | 262b319dcdbf6329d5ca3212b22323ebec7a7b49 (patch) | |
| tree | b10f16da65b12d577c37981bee52be6316e05024 /src/core/SkBitmap.cpp | |
| parent | 4d7a9bf0c0ec32394fb5923e01f816ca5ff29cd4 (diff) | |
Index8 is dead, remove guarded code
Needs google3 to be updated before this can land.
Bug: skia:6828
Change-Id: I2c16be13c6937ffa48768cc24f9f980171c824d6
Reviewed-on: https://skia-review.googlesource.com/23940
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkBitmap.cpp')
| -rw-r--r-- | src/core/SkBitmap.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 8f8d70f525..e3ce2834f2 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -242,11 +242,6 @@ 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); } @@ -270,11 +265,6 @@ 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); } @@ -432,9 +422,6 @@ 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; @@ -455,9 +442,6 @@ 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: @@ -658,17 +642,8 @@ static void write_raw_pixels(SkWriteBuffer* buffer, const SkPixmap& pmap) { src += ramRB; } 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 -#endif - { - buffer->writeBool(false); - } + // no colortable + buffer->writeBool(false); } void SkBitmap::WriteRawPixels(SkWriteBuffer* buffer, const SkBitmap& bitmap) { |