Index: tests/ColorSpaceTest.cpp |
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp |
index e5ecbc83462c610b66d7e03bfbef35b168548737..313eed86f118a9b9632f4c514baa5e21813dc801 100644 |
--- a/tests/ColorSpaceTest.cpp |
+++ b/tests/ColorSpaceTest.cpp |
@@ -35,14 +35,12 @@ |
SkColorSpace* colorSpace = codec->getColorSpace(); |
REPORTER_ASSERT(r, nullptr != colorSpace); |
- // The color profile that we have extracted has represents gamma with a lookup table. |
- // So we expect the gamma value to be zero. |
-#ifdef SK_DEBUG |
- const SkColorSpace::SkGammas& gammas = colorSpace->gammas(); |
- REPORTER_ASSERT(r, 0.0f == gammas.red()); |
- REPORTER_ASSERT(r, 0.0f == gammas.green()); |
- REPORTER_ASSERT(r, 0.0f == gammas.blue()); |
-#endif |
+ // No need to use almost equal here. The color profile that we have extracted |
+ // actually has a table of gammas. And our current implementation guesses 2.2f. |
+ SkFloat3 gammas = colorSpace->gamma(); |
+ REPORTER_ASSERT(r, 2.2f == gammas.fVec[0]); |
+ REPORTER_ASSERT(r, 2.2f == gammas.fVec[1]); |
+ REPORTER_ASSERT(r, 2.2f == gammas.fVec[2]); |
// These nine values were extracted from the color profile in isolation (before |
// we embedded it in the png). Here we check that we still extract the same values. |
@@ -77,12 +75,10 @@ |
// It's important to use almost equal here. This profile sets gamma as |
// 563 / 256, which actually comes out to about 2.19922. |
-#ifdef SK_DEBUG |
- const SkColorSpace::SkGammas& gammas = colorSpace->gammas(); |
- REPORTER_ASSERT(r, almost_equal(2.2f, gammas.red())); |
- REPORTER_ASSERT(r, almost_equal(2.2f, gammas.green())); |
- REPORTER_ASSERT(r, almost_equal(2.2f, gammas.blue())); |
-#endif |
+ SkFloat3 gammas = colorSpace->gamma(); |
+ REPORTER_ASSERT(r, almost_equal(2.2f, gammas.fVec[0])); |
+ REPORTER_ASSERT(r, almost_equal(2.2f, gammas.fVec[1])); |
+ REPORTER_ASSERT(r, almost_equal(2.2f, gammas.fVec[2])); |
// These nine values were extracted from the color profile. Until we know any |
// better, we'll assume these are the right values and test that we continue |