From 595599f46261225dfc67ab4d91d326e099558239 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Thu, 15 Dec 2016 13:05:53 -0500 Subject: Rearrange ICC profile parsing None of the small details have changed, just some high level reorganization: (1) Check for XYZ spaces before A2B. (2) If we fail to parse the XYZ space, fallback by trying to parse the A2B space. This should cause no image diffs on Gold. There is an image from the ICC website that is *supposed* to test that we parse the A2B tag before the XYZ tag. Our behavior on this image will actually not change - the XYZ tag is invalid (non-D50 matrix), so we fall back to A2B anyway. I think this behavior is ok. BUG:674584 Change-Id: I271fd990937268e03e98f5037a0837a574e775ef Reviewed-on: https://skia-review.googlesource.com/6143 Reviewed-by: Robert Aftias Commit-Queue: Matt Sarett --- src/core/SkColorSpace_A2B.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/SkColorSpace_A2B.h') diff --git a/src/core/SkColorSpace_A2B.h b/src/core/SkColorSpace_A2B.h index 77f1fa2e43..ed90713a2c 100644 --- a/src/core/SkColorSpace_A2B.h +++ b/src/core/SkColorSpace_A2B.h @@ -166,10 +166,10 @@ public: InputColorFormat inputColorFormat() const { return fInputColorFormat; } -private: SkColorSpace_A2B(InputColorFormat inputColorFormat, std::vector elements, PCS pcs, sk_sp profileData); +private: InputColorFormat fInputColorFormat; std::vector fElements; PCS fPCS; -- cgit v1.2.3