diff options
| author |  Brian Osman <brianosman@google.com> | 2018-03-13 14:35:27 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-13 14:35:33 +0000 |
| commit | 98242a847ac06e7f88d9b61ef1197a3bbfa9d89a (patch) | |
| tree | 239d6bfd2928221d8bfdbf4f04bccd7d5cf69d67 /src/core/SkColorSpacePriv.h | |
| parent | 57337d90a56f458451a01944efcdc205473bc0bb (diff) | |
Revert "Reland "Add SkColorSpaceXform_skcms""
This reverts commit 57337d90a56f458451a01944efcdc205473bc0bb.
Reason for revert: More investigation needed...
Original change's description:
> Reland "Add SkColorSpaceXform_skcms"
>
> This reverts commit 8103ecae7b535f011f89b03545fe768801027b6b.
>
> Reason for revert: Investigated the 565 diffs, they appear to be *more* correct.
>
> Original change's description:
> > Revert "Add SkColorSpaceXform_skcms"
> >
> > This reverts commit 67f62b1a61016ad07b44ae5a0bbf79d97adc9ba9.
> >
> > Reason for revert: I want to investigate the image/colorimage gold diffs. May be correct, but some of them are pretty large.
> >
> > Original change's description:
> > > Add SkColorSpaceXform_skcms
> > >
> > > Currently only enabled in Skia dev builds. Passes all unit
> > > tests. Has some GM differences, but nothing major.
> > >
> > > Bug: skia:
> > > Change-Id: Ib87f8cff44649c731e829f063ccef448d67d1910
> > > Reviewed-on: https://skia-review.googlesource.com/112520
> > > Commit-Queue: Brian Osman <brianosman@google.com>
> > > Reviewed-by: Mike Klein <mtklein@google.com>
> >
> > TBR=mtklein@google.com,brianosman@google.com,reed@google.com
> >
> > Change-Id: Ib4d7174f5c2700d6f742f488e740e5a6c87ac7a8
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/113880
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Commit-Queue: Brian Osman <brianosman@google.com>
>
> TBR=mtklein@google.com,brianosman@google.com,reed@google.com
>
> Change-Id: I6501ff55349a6aeed62bb64afc47f789e8cc3460
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/114040
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
TBR=mtklein@google.com,brianosman@google.com,reed@google.com
Change-Id: Ic9ee46032762a8b5fc96314c460ce01708673472
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/114100
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/core/SkColorSpacePriv.h')
| -rw-r--r-- | src/core/SkColorSpacePriv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/SkColorSpacePriv.h b/src/core/SkColorSpacePriv.h index 7b1b97dc03..80046bb232 100644 --- a/src/core/SkColorSpacePriv.h +++ b/src/core/SkColorSpacePriv.h @@ -48,8 +48,10 @@ static constexpr SkColorSpaceTransferFn gSRGB_TransferFn = static constexpr SkColorSpaceTransferFn g2Dot2_TransferFn = { 2.2f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; +// gLinear_TransferFn.fD > 1.0f: Make sure that we use the linear segment of +// the transfer function even when the x-value is 1.0f. static constexpr SkColorSpaceTransferFn gLinear_TransferFn = - { 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; + { 0.0f, 0.0f, 0.0f, 1.0f, 1.0000001f, 0.0f, 0.0f }; static constexpr SkColorSpaceTransferFn gDCIP3_TransferFn = { 2.399994f, 0.947998047f, 0.0520019531f, 0.0769958496f, 0.0390014648f, 0.0f, 0.0f }; |