Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: ui/gfx/color_transform.cc

Issue 2652503002: Use SkICC in gfx::ICCProfile and gfx::ColorSpace (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/color_space.cc ('k') | ui/gfx/color_transform_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/color_transform.cc
diff --git a/ui/gfx/color_transform.cc b/ui/gfx/color_transform.cc
index 3a63643c2a0fea8e6f8743984522a09a6e2e61d5..93370b0c0929524e0c0b92f365facc0537962968 100644
--- a/ui/gfx/color_transform.cc
+++ b/ui/gfx/color_transform.cc
@@ -859,13 +859,9 @@ class ColorSpaceToColorSpaceTransform {
public:
static Transform GetPrimaryTransform(const ColorSpace& c) {
if (c.primaries_ == ColorSpace::PrimaryID::CUSTOM) {
- return Transform(c.custom_primary_matrix_[0], c.custom_primary_matrix_[1],
- c.custom_primary_matrix_[2], c.custom_primary_matrix_[3],
- c.custom_primary_matrix_[4], c.custom_primary_matrix_[5],
- c.custom_primary_matrix_[6], c.custom_primary_matrix_[7],
- c.custom_primary_matrix_[8], c.custom_primary_matrix_[9],
- c.custom_primary_matrix_[10],
- c.custom_primary_matrix_[11], 0.0f, 0.0f, 0.0f, 1.0f);
+ SkMatrix44 sk_matrix;
+ c.GetPrimaryMatrix(&sk_matrix);
+ return Transform(sk_matrix);
} else {
return GetPrimaryMatrix(c.primaries_);
}
« no previous file with comments | « ui/gfx/color_space.cc ('k') | ui/gfx/color_transform_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698