AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SK_SUPPORT_LEGACY_ANDROID_CODEC_COLORSPACE

Browse Source 
Bug: b/123377741

Android no longer defines this flag, so remove the dead code.

Change-Id: I35bce8a0677ee86730effa6be297ad9718cee1c2
Reviewed-on: https://skia-review.googlesource.com/c/194001
Commit-Queue: Leon Scroggins <scroggo@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Auto-Submit: Leon Scroggins <scroggo@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
This commit is contained in:
Leon Scroggins III 2019-02-21 14:00:01 -05:00 committed by Skia Commit-Bot
parent ca660f0c5c
commit 3d86ff86d7
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/codec/SkAndroidCodec.cpp
View File

@ -162,17 +162,8 @@ SkAlphaType SkAndroidCodec::computeOutputAlphaType(bool requestedUnpremul) {
sk_sp<SkColorSpace> SkAndroidCodec::computeOutputColorSpace(SkColorType outputColorType, sk_sp<SkColorSpace> SkAndroidCodec::computeOutputColorSpace(SkColorType outputColorType,
sk_sp<SkColorSpace> prefColorSpace) { sk_sp<SkColorSpace> prefColorSpace) {
switch (outputColorType) { switch (outputColorType) {
#ifdef SK_SUPPORT_LEGACY_ANDROID_CODEC_COLORSPACE
case kRGBA_F16_SkColorType:
// Note that |prefColorSpace| is ignored, F16 is always linear sRGB.
return SkColorSpace::MakeSRGBLinear();
case kRGB_565_SkColorType:
// Note that |prefColorSpace| is ignored, 565 is always sRGB.
return SkColorSpace::MakeSRGB();
#else
case kRGBA_F16_SkColorType: case kRGBA_F16_SkColorType:
case kRGB_565_SkColorType: case kRGB_565_SkColorType:
#endif
case kRGBA_8888_SkColorType: case kRGBA_8888_SkColorType:
case kBGRA_8888_SkColorType: { case kBGRA_8888_SkColorType: {
// If |prefColorSpace| is supplied, choose it. // If |prefColorSpace| is supplied, choose it.