From 9e229233a67b36a508d3c753a5b93a022369c5f7 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 12 Jul 2018 11:38:10 -0400 Subject: update SkColor4f::FromColor() to preserve transfer function This kills off some sRGB tables, and lots of call sites can now use SkColor4f::FromColor(). It doesn't seem important to keep this test. Change-Id: Ia79ec8ace45e80bbc7a1e33f560f59289e61b2fb Reviewed-on: https://skia-review.googlesource.com/141046 Commit-Queue: Mike Klein Reviewed-by: Brian Osman --- src/shaders/SkImageShader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/shaders') diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index 22c3f95c04..b770d64c5f 100644 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -315,8 +315,8 @@ bool SkImageShader::onAppendStages(const StageRec& rec) const { SkColor4f paint_color; }; auto misc = alloc->make(); - misc->state = std::move(state); // Extend lifetime to match the pipeline's. - swizzle_rb(Sk4f_fromL32(rec.fPaint.getColor())).store(misc->paint_color.vec()); // sRGBA floats + misc->state = std::move(state); // Extend lifetime to match the pipeline's. + misc->paint_color = SkColor4f::FromColor(rec.fPaint.getColor()); p->append_matrix(alloc, matrix); auto gather = alloc->make(); -- cgit v1.2.3