From 44a8c74e3554abf8ad8726312ceecfbce2cddb7a Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 30 Apr 2018 12:16:29 -0400 Subject: Use skcms equality to detect sRGB profiles This ensures that table-based sRGB profiles convert to Skia's sRGB color space. Previously, they would turn into complex XYZ SkColorSpaces. Change-Id: Idda71970c6545b50d8ac8ff52872ed44e20aee39 Reviewed-on: https://skia-review.googlesource.com/124502 Auto-Submit: Brian Osman Commit-Queue: Mike Klein Reviewed-by: Mike Klein --- src/core/SkColorSpaceXform_skcms.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core') diff --git a/src/core/SkColorSpaceXform_skcms.cpp b/src/core/SkColorSpaceXform_skcms.cpp index bc5b3a23dc..4fd7cbf3da 100644 --- a/src/core/SkColorSpaceXform_skcms.cpp +++ b/src/core/SkColorSpaceXform_skcms.cpp @@ -133,6 +133,10 @@ sk_sp SkColorSpace::Make(const skcms_ICCProfile* profile) { return nullptr; } + if (skcms_ApproximatelyEqualProfiles(profile, &skcms_sRGB_profile)) { + return SkColorSpace::MakeSRGB(); + } + SkMatrix44 toXYZD50(SkMatrix44::kUninitialized_Constructor); toXYZD50.set3x3RowMajorf(&profile->toXYZD50.vals[0][0]); if (!toXYZD50.invert(nullptr)) { -- cgit v1.2.3