diff options
| author |  Brian Osman <brianosman@google.com> | 2018-03-12 11:11:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-12 16:09:28 +0000 |
| commit | d824406c4b3c662d457749e4e02ee43389309ef7 (patch) | |
| tree | 88e51782972d3faea6e796881480adc49b494b8e | |
| parent | cf81fa995f3806d1c35b555fb9420488b8a14517 (diff) | |
Remove SK_SUPPORT_LEGACY_ADOBE_XYZ
Chrome stopped using this months ago
Change-Id: I5ea432b1545980680b2d54205513a55ef43dfc62
Reviewed-on: https://skia-review.googlesource.com/113711
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
| -rw-r--r-- | src/core/SkColorSpace.cpp | 9 | ||||
| -rw-r--r-- | src/core/SkColorSpacePriv.h | 6 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp index 6fc874b649..be399bda6f 100644 --- a/src/core/SkColorSpace.cpp +++ b/src/core/SkColorSpace.cpp @@ -114,15 +114,6 @@ sk_sp<SkColorSpace> SkColorSpace::MakeRGB(SkGammaNamed gammaNamed, const SkMatri return SkColorSpace::MakeSRGB(); } break; -#ifdef SK_SUPPORT_LEGACY_ADOBE_XYZ - case k2Dot2Curve_SkGammaNamed: - if (xyz_almost_equal(toXYZD50, gAdobeRGB_toXYZD50)) { - SkMatrix44 adobe44(SkMatrix44::kUninitialized_Constructor); - adobe44.set3x3RowMajorf(gAdobeRGB_toXYZD50); - return sk_sp<SkColorSpace>(new SkColorSpace_XYZ(k2Dot2Curve_SkGammaNamed, adobe44)); - } - break; -#endif case kLinear_SkGammaNamed: if (xyz_almost_equal(toXYZD50, gSRGB_toXYZD50)) { return SkColorSpace::MakeSRGBLinear(); diff --git a/src/core/SkColorSpacePriv.h b/src/core/SkColorSpacePriv.h index 813464b645..80046bb232 100644 --- a/src/core/SkColorSpacePriv.h +++ b/src/core/SkColorSpacePriv.h @@ -21,11 +21,6 @@ static constexpr float gSRGB_toXYZD50[] { }; static constexpr float gAdobeRGB_toXYZD50[] { -#ifdef SK_SUPPORT_LEGACY_ADOBE_XYZ - 0.6097559f, 0.2052401f, 0.1492240f, // Rx, Gx, Bx - 0.3111242f, 0.6256560f, 0.0632197f, // Ry, Gy, Gz - 0.0194811f, 0.0608902f, 0.7448387f, // Rz, Gz, Bz -#else // ICC fixed-point (16.16) repesentation of: // 0.60974, 0.20528, 0.14919, // 0.31111, 0.62567, 0.06322, @@ -33,7 +28,6 @@ static constexpr float gAdobeRGB_toXYZD50[] { SkFixedToFloat(0x9c18), SkFixedToFloat(0x348d), SkFixedToFloat(0x2631), // Rx, Gx, Bx SkFixedToFloat(0x4fa5), SkFixedToFloat(0xa02c), SkFixedToFloat(0x102f), // Ry, Gy, Gz SkFixedToFloat(0x04fc), SkFixedToFloat(0x0f95), SkFixedToFloat(0xbe9c), // Rz, Gz, Bz -#endif }; static constexpr float gDCIP3_toXYZD50[] { |