diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-07-13 13:18:56 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-13 13:19:04 +0000 |
| commit | 4a17501f5bbd5e45a49d76d7a733393fec9701ee (patch) | |
| tree | cfef179372e83944b91c183133cc4ccde6e103ac /src/core/SkColor.cpp | |
| parent | bc8133b4adf481edf62158f07951e06e20c2f92a (diff) | |
Revert "update SkColor4f::FromColor() to preserve transfer function"
This reverts commit 9e229233a67b36a508d3c753a5b93a022369c5f7.
Reason for revert: See if blocking Android roll
Original change's description:
> 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 <mtklein@chromium.org>
> Reviewed-by: Brian Osman <brianosman@google.com>
TBR=mtklein@chromium.org,brianosman@google.com
Change-Id: I9d76e4ccf8a101853a7404abb33bdab9e0c64c25
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/141181
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/core/SkColor.cpp')
| -rw-r--r-- | src/core/SkColor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkColor.cpp b/src/core/SkColor.cpp index 9c02378f59..6c9f0093d0 100644 --- a/src/core/SkColor.cpp +++ b/src/core/SkColor.cpp @@ -153,7 +153,7 @@ void SkPM4f::assertIsUnit() const { SkColor4f SkColor4f::FromColor(SkColor bgra) { SkColor4f rgba; - swizzle_rb(Sk4f_fromL32(bgra)).store(rgba.vec()); + swizzle_rb(Sk4f_fromS32(bgra)).store(rgba.vec()); return rgba; } |