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/codec/SkSwizzler.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/codec/SkSwizzler.cpp')
| -rw-r--r-- | src/codec/SkSwizzler.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/codec/SkSwizzler.cpp b/src/codec/SkSwizzler.cpp index 31fc063aec..c19dd05b65 100644 --- a/src/codec/SkSwizzler.cpp +++ b/src/codec/SkSwizzler.cpp @@ -104,6 +104,7 @@ static void swizzle_bit_to_grayscale( #undef GRAYSCALE_BLACK #undef GRAYSCALE_WHITE +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE // same as swizzle_bit_to_grayscale and swizzle_bit_to_n32 except for value assigned to dst[x] static void swizzle_bit_to_index( void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth, @@ -124,6 +125,7 @@ static void swizzle_bit_to_index( dst[x] = ((currByte >> (7-bitIndex)) & 1); } } +#endif // same as swizzle_bit_to_grayscale and swizzle_bit_to_index except for value assigned to dst[x] static void swizzle_bit_to_n32( @@ -203,6 +205,7 @@ static void swizzle_bit_to_f16( // kIndex1, kIndex2, kIndex4 +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE static void swizzle_small_index_to_index( void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth, int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) { @@ -223,6 +226,7 @@ static void swizzle_small_index_to_index( dst[x] = index; } } +#endif static void swizzle_small_index_to_565( void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth, @@ -887,9 +891,11 @@ SkSwizzler* SkSwizzler::CreateSwizzler(const SkEncodedInfo& encodedInfo, case kBGRA_8888_SkColorType: proc = &swizzle_bit_to_n32; break; +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE case kIndex_8_SkColorType: proc = &swizzle_bit_to_index; break; +#endif case kRGB_565_SkColorType: proc = &swizzle_bit_to_565; break; @@ -970,9 +976,11 @@ SkSwizzler* SkSwizzler::CreateSwizzler(const SkEncodedInfo& encodedInfo, case kRGB_565_SkColorType: proc = &swizzle_small_index_to_565; break; +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE case kIndex_8_SkColorType: proc = &swizzle_small_index_to_index; break; +#endif default: return nullptr; } @@ -990,10 +998,12 @@ SkSwizzler* SkSwizzler::CreateSwizzler(const SkEncodedInfo& encodedInfo, case kRGB_565_SkColorType: proc = &swizzle_index_to_565; break; +#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE case kIndex_8_SkColorType: proc = &sample1; fastProc = © break; +#endif default: return nullptr; } |