diff options
author | Ravi Mistry <rmistry@google.com> | 2016-12-17 01:26:51 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-17 01:27:10 +0000 |
commit | eb733fbf56538838a36814c75cd03f917462cb22 (patch) | |
tree | 2ac19e158200809964bffad6d5ca1794c84c4d8f /src/core/SkColorSpace_XYZ.cpp | |
parent | 2ee084e73056b0ad76b721017f576168b7306da3 (diff) |
Revert "WIP: Skia support library for ICC tasks"
This reverts commit fc8dc3194acb959ee5980b41766660ca0644bcab.
Reason for revert: Breaks Build-Mac-Clang-Arm7-{Debug,Release}-iOS builds.
Example tasks:
* https://chromium-swarm.appspot.com/task?id=3322f668620b9e10&refresh=10
* https://chromium-swarm.appspot.com/task?id=332296146331e810&refresh=10
Original change's description:
> WIP: Skia support library for ICC tasks
>
> As a starting point, this would be mostly trivial to implement using
> SkColorSpace.
>
> This also would give us the flexibility to begin to move all of
> the ICC related code from SkColorSpace to SkICC.
>
> What are the advantages of moving this away from SkColorSpace?
> (1) A long term goal (once Chrome uses SkCodec), might be to
> move SkColorSpace::MakeICC() out of the public API. That way,
> we can guarantee that we can draw to/from *any* SkColorSpace.
> (2) Keeps SkColorSpace separate from ICC-specific representations
> like SkColorSpaceTransferFn etc.
>
> BUG=skia:
>
> Change-Id: Iddeb9903221fb57fbfc01218d8641c928b4a5165
> Reviewed-on: https://skia-review.googlesource.com/5676
> Commit-Queue: Matt Sarett <msarett@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
>
TBR=mtklein@google.com,msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org
BUG=skia:
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ibdf272fce25892402bd3e85595fb8814cdf59856
Reviewed-on: https://skia-review.googlesource.com/6232
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'src/core/SkColorSpace_XYZ.cpp')
-rw-r--r-- | src/core/SkColorSpace_XYZ.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/core/SkColorSpace_XYZ.cpp b/src/core/SkColorSpace_XYZ.cpp index 30f70b6e26..b91789614f 100644 --- a/src/core/SkColorSpace_XYZ.cpp +++ b/src/core/SkColorSpace_XYZ.cpp @@ -5,9 +5,8 @@ * found in the LICENSE file. */ -#include "SkChecksum.h" #include "SkColorSpace_XYZ.h" -#include "SkColorSpacePriv.h" +#include "SkChecksum.h" #include "SkColorSpaceXform_Base.h" static constexpr float gSRGB_toXYZD50[] { @@ -65,29 +64,6 @@ bool SkColorSpace_XYZ::onGammaIsLinear() const { return kLinear_SkGammaNamed == fGammaNamed; } -bool SkColorSpace_XYZ::onIsNumericalTransferFn(SkColorSpaceTransferFn* coeffs) const { - if (named_to_parametric(coeffs, fGammaNamed)) { - return true; - } - - SkASSERT(fGammas); - if (fGammas->data(0) != fGammas->data(1) || fGammas->data(0) != fGammas->data(2)) { - return false; - } - - if (fGammas->isValue(0)) { - value_to_parametric(coeffs, fGammas->data(0).fValue); - return true; - } - - if (fGammas->isParametric(0)) { - *coeffs = fGammas->params(0); - return true; - } - - return false; -} - sk_sp<SkColorSpace> SkColorSpace_XYZ::makeLinearGamma() { if (this->gammaIsLinear()) { return sk_ref_sp(this); |