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/SkImageInfoPriv.h | |
| 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/SkImageInfoPriv.h')
| -rw-r--r-- | src/core/SkImageInfoPriv.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h index 43680ad605..38de97f8a2 100644 --- a/src/core/SkImageInfoPriv.h +++ b/src/core/SkImageInfoPriv.h @@ -111,24 +111,6 @@ static inline bool SkImageInfoValidConversion(const SkImageInfo& dst, const SkIm return false; } -#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE - if (kIndex_8_SkColorType == dst.colorType()) { - if (kIndex_8_SkColorType != src.colorType()) { - return false; - } - - if ((kPremul_SkAlphaType == dst.alphaType() && kUnpremul_SkAlphaType == src.alphaType()) || - (kUnpremul_SkAlphaType == dst.alphaType() && kPremul_SkAlphaType == src.alphaType())) - { - return false; - } - - if (dst.colorSpace() && !SkColorSpace::Equals(dst.colorSpace(), src.colorSpace())) { - return false; - } - } -#endif - if (kGray_8_SkColorType == dst.colorType()) { if (kGray_8_SkColorType != src.colorType()) { return false; |