| Index: tests/ColorSpaceTest.cpp
|
| diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
|
| index a6ed9e3cf9c8c77a984b92985a90beb4f0065b83..8f8b7a56248dae949ef1a94c0a6c5534e3a28ba3 100644
|
| --- a/tests/ColorSpaceTest.cpp
|
| +++ b/tests/ColorSpaceTest.cpp
|
| @@ -9,6 +9,7 @@
|
| #include "SkCodec.h"
|
| #include "SkColorSpace.h"
|
| #include "SkColorSpace_Base.h"
|
| +#include "SkColorSpace_XYZTRC.h"
|
| #include "Test.h"
|
|
|
| #include "png.h"
|
| @@ -22,9 +23,9 @@ static void test_space(skiatest::Reporter* r, SkColorSpace* space,
|
| const SkGammaNamed expectedGamma) {
|
|
|
| REPORTER_ASSERT(r, nullptr != space);
|
| - REPORTER_ASSERT(r, expectedGamma == as_CSB(space)->gammaNamed());
|
| + REPORTER_ASSERT(r, expectedGamma == as_CSXYZ(space)->gammaNamed());
|
|
|
| - const SkMatrix44& mat = as_CSB(space)->toXYZD50();
|
| + const SkMatrix44& mat = as_CSXYZ(space)->toXYZD50();
|
| const float src[] = {
|
| 1, 0, 0, 1,
|
| 0, 1, 0, 1,
|
| @@ -166,8 +167,8 @@ DEF_TEST(ColorSpaceWriteICC, r) {
|
| sk_sp<SkData> newMonitorData = ColorSpaceTest::WriteToICC(monitorSpace.get());
|
| sk_sp<SkColorSpace> newMonitorSpace = SkColorSpace::NewICC(newMonitorData->data(),
|
| newMonitorData->size());
|
| - REPORTER_ASSERT(r, as_CSB(monitorSpace)->toXYZD50() == as_CSB(newMonitorSpace)->toXYZD50());
|
| - REPORTER_ASSERT(r, as_CSB(monitorSpace)->gammaNamed() == as_CSB(newMonitorSpace)->gammaNamed());
|
| + REPORTER_ASSERT(r, as_CSXYZ(monitorSpace)->toXYZD50() == as_CSXYZ(newMonitorSpace)->toXYZD50());
|
| + REPORTER_ASSERT(r, as_CSXYZ(monitorSpace)->gammaNamed() == as_CSXYZ(newMonitorSpace)->gammaNamed());
|
| }
|
|
|
| DEF_TEST(ColorSpace_Named, r) {
|
| @@ -184,7 +185,7 @@ DEF_TEST(ColorSpace_Named, r) {
|
| auto cs = SkColorSpace::NewNamed(rec.fNamed);
|
| REPORTER_ASSERT(r, cs);
|
| if (cs) {
|
| - REPORTER_ASSERT(r, rec.fExpectedGamma == as_CSB(cs)->gammaNamed());
|
| + REPORTER_ASSERT(r, rec.fExpectedGamma == as_CSXYZ(cs)->gammaNamed());
|
| }
|
| }
|
|
|
|
|