diff options
| author |  Matt Sarett <msarett@google.com> | 2017-05-05 10:38:01 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-05 15:18:03 +0000 |
| commit | 9d687dfa3e341bc4bae7806b6e3262ae3d441889 (patch) | |
| tree | 8138982a7237fc70cfbd01f16c849388db03d3fd /tests/ColorSpaceTest.cpp | |
| parent | 788c3c467a019f31e6e2c6d07a7b644bc157bb34 (diff) | |
Avoid interpolating color lut with less than 2 points
Bug: 717935
Change-Id: Ibf15b815891eef5a0239bc408bcbfe7c8b1507c5
Reviewed-on: https://skia-review.googlesource.com/15301
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tests/ColorSpaceTest.cpp')
| -rw-r--r-- | tests/ColorSpaceTest.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index 2eb7347092..9b2e1b3dc6 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -446,10 +446,21 @@ DEF_TEST(ColorSpace_Primaries, r) { DEF_TEST(ColorSpace_InvalidICC, r) { // This color space has a matrix that is not D50. - sk_sp<SkData> data = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/SM2333SW.icc").c_str()); + sk_sp<SkData> data = GetResourceAsData("icc_profiles/SM2333SW.icc"); + if (!data) { + return; + } sk_sp<SkColorSpace> cs = SkColorSpace::MakeICC(data->data(), data->size()); REPORTER_ASSERT(r, !cs); + + // The color space has a color lut with only one entry in each dimension. + data = GetResourceAsData("icc_profiles/invalid_color_lut.icc"); + if (!data) { + return; + } + + cs = SkColorSpace::MakeICC(data->data(), data->size()); + REPORTER_ASSERT(r, !cs); } DEF_TEST(ColorSpace_MatrixHash, r) { |