diff options
| author |  Matt Sarett <msarett@google.com> | 2016-12-19 14:33:35 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-19 20:23:03 +0000 |
| commit | 2410717f900c2691db880d84a2e03a6a24905ee2 (patch) | |
| tree | c89ffb3c18cc289fc68f37e166235dc36456b74b /tests | |
| parent | 65869fb64b56a4c59d74003c1fac5dffc8a8bf65 (diff) | |
Fix swapped interpretation of c and e in SkColorSpace_ICC
The ICC errata supports the opposite of what we do.
http://www.color.org/icc_specs2.xalter
TBR=reed@google.com
BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: I18ace7f312926b264e624c30d8cb983eff5c434b
Reviewed-on: https://skia-review.googlesource.com/6277
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ColorSpaceTest.cpp | 8 | ||||
| -rw-r--r-- | tests/ColorSpaceXformTest.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index e1ff1609b2..070d50264f 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -240,9 +240,9 @@ DEF_TEST(ColorSpace_Serialize, r) { SkColorSpaceTransferFn fn; fn.fA = 1.0f; fn.fB = 0.0f; - fn.fC = 0.0f; + fn.fC = 1.0f; fn.fD = 0.5f; - fn.fE = 1.0f; + fn.fE = 0.0f; fn.fF = 0.0f; fn.fG = 1.0f; SkMatrix44 toXYZ(SkMatrix44::kIdentity_Constructor); @@ -265,9 +265,9 @@ DEF_TEST(ColorSpace_Equals, r) { SkColorSpaceTransferFn fn; fn.fA = 1.0f; fn.fB = 0.0f; - fn.fC = 0.0f; + fn.fC = 1.0f; fn.fD = 0.5f; - fn.fE = 1.0f; + fn.fE = 0.0f; fn.fF = 0.0f; fn.fG = 1.0f; SkMatrix44 toXYZ(SkMatrix44::kIdentity_Constructor); diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp index d2bd2a3358..413d74ee85 100644 --- a/tests/ColorSpaceXformTest.cpp +++ b/tests/ColorSpaceXformTest.cpp @@ -176,18 +176,18 @@ DEF_TEST(ColorSpaceXform_ParametricGamma, r) { SkColorSpaceTransferFn* params = SkTAddOffset<SkColorSpaceTransferFn> (memory, sizeof(SkGammas)); - // Interval, switch xforms at 0.0031308f + // Interval. params->fD = 0.04045f; // First equation: - params->fE = 1.0f / 12.92f; + params->fC = 1.0f / 12.92f; params->fF = 0.0f; // Second equation: // Note that the function is continuous (it's actually sRGB). params->fA = 1.0f / 1.055f; params->fB = 0.055f / 1.055f; - params->fC = 0.0f; + params->fE = 0.0f; params->fG = 2.4f; test_identity_xform(r, gammas, true); test_identity_xform_A2B(r, kNonStandard_SkGammaNamed, gammas); @@ -239,9 +239,9 @@ DEF_TEST(ColorSpaceXform_NonMatchingGamma, r) { sizeof(SkGammas) + sizeof(float) * tableSize); params->fA = 1.0f / 1.055f; params->fB = 0.055f / 1.055f; - params->fC = 0.0f; + params->fC = 1.0f / 12.92f; params->fD = 0.04045f; - params->fE = 1.0f / 12.92f; + params->fE = 0.0f; params->fF = 0.0f; params->fG = 2.4f; |