diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-07-13 08:05:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-13 13:33:32 +0000 |
| commit | c20b5f83595073c02009ff3c0a8a77aca6ad1e71 (patch) | |
| tree | 17db98265ad7ca1f1eae6cb38258d489b0ac221e /src | |
| parent | c3c9d817f0187267b45f3f5cb419bc96411e3e77 (diff) | |
Fix computeOutputColorSpace
This was accidentally broken when we added a guard for
kIndex_8 (https://skia-review.googlesource.com/c/22721).
Reenable the code for 32 bit color types.
Change-Id: Ibb79a163dc1cffe14e19d2affa17856b549509c4
Reviewed-on: https://skia-review.googlesource.com/23020
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/codec/SkAndroidCodec.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp index 8f3146ed16..046f0ae3c4 100644 --- a/src/codec/SkAndroidCodec.cpp +++ b/src/codec/SkAndroidCodec.cpp @@ -17,7 +17,6 @@ static bool is_valid_sample_size(int sampleSize) { return sampleSize > 0; } -#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE /** * Loads the gamut as a set of three points (triangle). */ @@ -60,7 +59,6 @@ static bool is_wide_gamut(const SkColorSpace* colorSpace) { return false; } -#endif SkAndroidCodec::SkAndroidCodec(SkCodec* codec) : fInfo(codec->getInfo()) @@ -150,10 +148,11 @@ SkAlphaType SkAndroidCodec::computeOutputAlphaType(bool requestedUnpremul) { sk_sp<SkColorSpace> SkAndroidCodec::computeOutputColorSpace(SkColorType outputColorType, sk_sp<SkColorSpace> prefColorSpace) { switch (outputColorType) { - case kRGBA_8888_SkColorType: - case kBGRA_8888_SkColorType: #ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE - case kIndex_8_SkColorType: { + case kIndex_8_SkColorType: +#endif + case kRGBA_8888_SkColorType: + case kBGRA_8888_SkColorType: { // If |prefColorSpace| is supported, choose it. SkColorSpaceTransferFn fn; if (prefColorSpace && prefColorSpace->isNumericalTransferFn(&fn)) { @@ -174,7 +173,6 @@ sk_sp<SkColorSpace> SkAndroidCodec::computeOutputColorSpace(SkColorType outputCo return SkColorSpace::MakeSRGB(); } -#endif case kRGBA_F16_SkColorType: // Note that |prefColorSpace| is ignored, F16 is always linear sRGB. return SkColorSpace::MakeSRGBLinear(); |