commit 98eb297750e68a80206236e47aa6a5c86b1f4ee5
author Brian Osman <brianosman@google.com> Tue Oct 05 16:24:42 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Oct 06 00:12:42 2021 +0000
tree 8b5b3b3412d009392a3a7f26ade2bc4b0af76cc1
parent ff5bb37b72b22e5dcb8c659527c97bf08ad4b377

Generate ICC profiles with version 4.3 (not 2.1)

We've been making profiles tagged as version 2.1, but using features
that aren't allowed until 4+. Nearly all software doesn't care (most
ICC parsers are lenient about this), but Windows 7 Photo Viewer does
not like this. The latest ICC spec is 4.3 (ca 2001), so use that.

Bug: skia:12491
Change-Id: I7867ed73894ce3b55a61f4b7e5de29269c7c0dca
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456256
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/core/SkICC.cpp

diff --git a/src/core/SkICC.cpp b/src/core/SkICC.cpp
index dbf9ee6..1f92424 100644
--- a/src/core/SkICC.cpp
+++ b/src/core/SkICC.cpp
@@ -96,7 +96,7 @@
 static constexpr uint32_t kICCHeader[kICCHeaderSize / 4] {
     SkEndian_SwapBE32(kICCProfileSize),  // Size of the profile
     0,                                   // Preferred CMM type (ignored)
-    SkEndian_SwapBE32(0x02100000),       // Version 2.1
+    SkEndian_SwapBE32(0x04300000),       // Version 4.3
     SkEndian_SwapBE32(kDisplay_Profile), // Display device profile
     SkEndian_SwapBE32(kRGB_ColorSpace),  // RGB input color space
     SkEndian_SwapBE32(kXYZ_PCSSpace),    // XYZ profile connection space