| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2016 Google Inc. | 2 * Copyright 2016 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "Resources.h" | 8 #include "Resources.h" |
| 9 #include "SkCodec.h" | 9 #include "SkCodec.h" |
| 10 #include "SkColorSpace.h" | 10 #include "SkColorSpace.h" |
| 11 #include "SkColorSpace_Base.h" | 11 #include "SkColorSpace_Base.h" |
| 12 #include "SkColorSpace_XYZTRC.h" |
| 12 #include "Test.h" | 13 #include "Test.h" |
| 13 | 14 |
| 14 #include "png.h" | 15 #include "png.h" |
| 15 | 16 |
| 16 static bool almost_equal(float a, float b) { | 17 static bool almost_equal(float a, float b) { |
| 17 return SkTAbs(a - b) < 0.001f; | 18 return SkTAbs(a - b) < 0.001f; |
| 18 } | 19 } |
| 19 | 20 |
| 20 static void test_space(skiatest::Reporter* r, SkColorSpace* space, | 21 static void test_space(skiatest::Reporter* r, SkColorSpace* space, |
| 21 const float red[], const float green[], const float blue[
], | 22 const float red[], const float green[], const float blue[
], |
| 22 const SkGammaNamed expectedGamma) { | 23 const SkGammaNamed expectedGamma) { |
| 23 | 24 |
| 24 REPORTER_ASSERT(r, nullptr != space); | 25 REPORTER_ASSERT(r, nullptr != space); |
| 25 REPORTER_ASSERT(r, expectedGamma == as_CSB(space)->gammaNamed()); | 26 SkASSERT(as_CSB(space)->toXYZD50()); |
| 27 const SkColorSpace_XYZTRC* csXYZ = static_cast<const SkColorSpace_XYZTRC*>(s
pace); |
| 28 REPORTER_ASSERT(r, expectedGamma == csXYZ->gammaNamed()); |
| 26 | 29 |
| 27 const SkMatrix44& mat = as_CSB(space)->toXYZD50(); | 30 const SkMatrix44& mat = *csXYZ->toXYZD50(); |
| 28 const float src[] = { | 31 const float src[] = { |
| 29 1, 0, 0, 1, | 32 1, 0, 0, 1, |
| 30 0, 1, 0, 1, | 33 0, 1, 0, 1, |
| 31 0, 0, 1, 1, | 34 0, 0, 1, 1, |
| 32 }; | 35 }; |
| 33 const float* ref[3] = { red, green, blue }; | 36 const float* ref[3] = { red, green, blue }; |
| 34 float dst[4]; | 37 float dst[4]; |
| 35 for (int i = 0; i < 3; ++i) { | 38 for (int i = 0; i < 3; ++i) { |
| 36 mat.mapScalars(&src[i*4], dst); | 39 mat.mapScalars(&src[i*4], dst); |
| 37 REPORTER_ASSERT(r, almost_equal(ref[i][0], dst[0])); | 40 REPORTER_ASSERT(r, almost_equal(ref[i][0], dst[0])); |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); | 162 GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); |
| 160 REPORTER_ASSERT(r, monitorData); | 163 REPORTER_ASSERT(r, monitorData); |
| 161 if (!monitorData) { | 164 if (!monitorData) { |
| 162 return; | 165 return; |
| 163 } | 166 } |
| 164 sk_sp<SkColorSpace> monitorSpace = SkColorSpace::NewICC(monitorData->data(), | 167 sk_sp<SkColorSpace> monitorSpace = SkColorSpace::NewICC(monitorData->data(), |
| 165 monitorData->size())
; | 168 monitorData->size())
; |
| 166 sk_sp<SkData> newMonitorData = ColorSpaceTest::WriteToICC(monitorSpace.get()
); | 169 sk_sp<SkData> newMonitorData = ColorSpaceTest::WriteToICC(monitorSpace.get()
); |
| 167 sk_sp<SkColorSpace> newMonitorSpace = SkColorSpace::NewICC(newMonitorData->d
ata(), | 170 sk_sp<SkColorSpace> newMonitorSpace = SkColorSpace::NewICC(newMonitorData->d
ata(), |
| 168 newMonitorData->s
ize()); | 171 newMonitorData->s
ize()); |
| 169 REPORTER_ASSERT(r, as_CSB(monitorSpace)->toXYZD50() == as_CSB(newMonitorSpac
e)->toXYZD50()); | 172 SkASSERT(as_CSB(monitorSpace)->toXYZD50()); |
| 170 REPORTER_ASSERT(r, as_CSB(monitorSpace)->gammaNamed() == as_CSB(newMonitorSp
ace)->gammaNamed()); | 173 const SkColorSpace_XYZTRC* monitorSpaceXYZ = |
| 174 static_cast<const SkColorSpace_XYZTRC*>(monitorSpace.get()); |
| 175 SkASSERT(as_CSB(newMonitorSpace)->toXYZD50()); |
| 176 const SkColorSpace_XYZTRC* newMonitorSpaceXYZ = |
| 177 static_cast<const SkColorSpace_XYZTRC*>(newMonitorSpace.get()); |
| 178 REPORTER_ASSERT(r, *monitorSpaceXYZ->toXYZD50() == *newMonitorSpaceXYZ->toXY
ZD50()); |
| 179 REPORTER_ASSERT(r, monitorSpaceXYZ->gammaNamed() == newMonitorSpaceXYZ->gamm
aNamed()); |
| 171 } | 180 } |
| 172 | 181 |
| 173 DEF_TEST(ColorSpace_Named, r) { | 182 DEF_TEST(ColorSpace_Named, r) { |
| 174 const struct { | 183 const struct { |
| 175 SkColorSpace::Named fNamed; | 184 SkColorSpace::Named fNamed; |
| 176 SkGammaNamed fExpectedGamma; | 185 SkGammaNamed fExpectedGamma; |
| 177 } recs[] { | 186 } recs[] { |
| 178 { SkColorSpace::kSRGB_Named, kSRGB_SkGammaNamed }, | 187 { SkColorSpace::kSRGB_Named, kSRGB_SkGammaNamed }, |
| 179 { SkColorSpace::kAdobeRGB_Named, k2Dot2Curve_SkGammaNamed }, | 188 { SkColorSpace::kAdobeRGB_Named, k2Dot2Curve_SkGammaNamed }, |
| 180 { SkColorSpace::kSRGBLinear_Named, kLinear_SkGammaNamed }, | 189 { SkColorSpace::kSRGBLinear_Named, kLinear_SkGammaNamed }, |
| 181 }; | 190 }; |
| 182 | 191 |
| 183 for (auto rec : recs) { | 192 for (auto rec : recs) { |
| 184 auto cs = SkColorSpace::NewNamed(rec.fNamed); | 193 auto cs = SkColorSpace::NewNamed(rec.fNamed); |
| 185 REPORTER_ASSERT(r, cs); | 194 REPORTER_ASSERT(r, cs); |
| 186 if (cs) { | 195 if (cs) { |
| 187 REPORTER_ASSERT(r, rec.fExpectedGamma == as_CSB(cs)->gammaNamed()); | 196 SkASSERT(as_CSB(cs)->toXYZD50()); |
| 197 const SkColorSpace_XYZTRC* csXYZ = static_cast<const SkColorSpace_XY
ZTRC*>(cs.get()); |
| 198 REPORTER_ASSERT(r, rec.fExpectedGamma == csXYZ->gammaNamed()); |
| 188 } | 199 } |
| 189 } | 200 } |
| 190 | 201 |
| 191 SkImageInfo info = SkImageInfo::MakeS32(10, 10, kPremul_SkAlphaType); | 202 SkImageInfo info = SkImageInfo::MakeS32(10, 10, kPremul_SkAlphaType); |
| 192 REPORTER_ASSERT(r, info.gammaCloseToSRGB()); | 203 REPORTER_ASSERT(r, info.gammaCloseToSRGB()); |
| 193 } | 204 } |
| 194 | 205 |
| 195 static void test_serialize(skiatest::Reporter* r, SkColorSpace* space, bool isNa
med) { | 206 static void test_serialize(skiatest::Reporter* r, SkColorSpace* space, bool isNa
med) { |
| 196 sk_sp<SkData> data1 = space->serialize(); | 207 sk_sp<SkData> data1 = space->serialize(); |
| 197 | 208 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), nullptr)); | 275 REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), nullptr)); |
| 265 REPORTER_ASSERT(r, !SkColorSpace::Equals(adobe.get(), srgb.get())); | 276 REPORTER_ASSERT(r, !SkColorSpace::Equals(adobe.get(), srgb.get())); |
| 266 REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), srgb.get())); | 277 REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), srgb.get())); |
| 267 REPORTER_ASSERT(r, !SkColorSpace::Equals(z32.get(), z30.get())); | 278 REPORTER_ASSERT(r, !SkColorSpace::Equals(z32.get(), z30.get())); |
| 268 REPORTER_ASSERT(r, !SkColorSpace::Equals(upperLeft.get(), srgb.get())); | 279 REPORTER_ASSERT(r, !SkColorSpace::Equals(upperLeft.get(), srgb.get())); |
| 269 REPORTER_ASSERT(r, !SkColorSpace::Equals(upperLeft.get(), upperRight.get()))
; | 280 REPORTER_ASSERT(r, !SkColorSpace::Equals(upperLeft.get(), upperRight.get()))
; |
| 270 REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), upperRight.get())); | 281 REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), upperRight.get())); |
| 271 REPORTER_ASSERT(r, !SkColorSpace::Equals(upperRight.get(), adobe.get())); | 282 REPORTER_ASSERT(r, !SkColorSpace::Equals(upperRight.get(), adobe.get())); |
| 272 REPORTER_ASSERT(r, !SkColorSpace::Equals(rgb1.get(), rgb2.get())); | 283 REPORTER_ASSERT(r, !SkColorSpace::Equals(rgb1.get(), rgb2.get())); |
| 273 } | 284 } |
| OLD | NEW |