diff options
author | Brian Osman <brianosman@google.com> | 2018-03-12 21:07:19 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-12 21:07:29 +0000 |
commit | 8103ecae7b535f011f89b03545fe768801027b6b (patch) | |
tree | 88aa105427f2ca28a044ba242ecbed36ededb4d6 /src/core/SkColorSpaceXform.cpp | |
parent | 67f62b1a61016ad07b44ae5a0bbf79d97adc9ba9 (diff) |
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>
Diffstat (limited to 'src/core/SkColorSpaceXform.cpp')
-rw-r--r-- | src/core/SkColorSpaceXform.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/SkColorSpaceXform.cpp b/src/core/SkColorSpaceXform.cpp index a850767291..7c53ed52dc 100644 --- a/src/core/SkColorSpaceXform.cpp +++ b/src/core/SkColorSpaceXform.cpp @@ -317,14 +317,9 @@ std::unique_ptr<SkColorSpaceXform> SkColorSpaceXform_Base::New( } if (src->toXYZD50()) { -#if defined(SK_USE_SKCMS) - // TODO: Use this unconditionally, once A2B transform is implemented in skcms. - return MakeSkcmsXform(src, dst, premulBehavior); -#else return skstd::make_unique<SkColorSpaceXform_XYZ>(static_cast<SkColorSpace_XYZ*>(src), static_cast<SkColorSpace_XYZ*>(dst), premulBehavior); -#endif } return skstd::make_unique<SkColorSpaceXform_A2B>(static_cast<SkColorSpace_A2B*>(src), static_cast<SkColorSpace_XYZ*>(dst)); |