diff options
author | Mike Klein <mtklein@chromium.org> | 2018-05-22 10:32:20 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-23 12:30:36 +0000 |
commit | 6747f52778135ee59debe52ac27d8f19333d75f2 (patch) | |
tree | a4971615d99d6c5268354a81ff71c23bd97026e4 /src/core/SkColorSpace_XYZ.cpp | |
parent | bb9cad053ba577e7e20e03c15a5243faa82ece5b (diff) |
Reland "start cleaning up non-skcms SkColorSpaceXforms"
This is a reland of 339133f82c30cd3080672db28e6f72c894cba05a
Original change's description:
> start cleaning up non-skcms SkColorSpaceXforms
>
> I think this gets rid of
> - SkColorSpaceXform_Base
> - SkColorSpaceXform_XYZ
> - SkColorSpaceXform_A2B
> and lots of support code. Might be more left to clean up?
>
> Change-Id: I560d974d1e879dfd6a63ee2244a3dd88bd495c8a
> Reviewed-on: https://skia-review.googlesource.com/129512
> Commit-Queue: Brian Osman <brianosman@google.com>
> Auto-Submit: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Brian Osman <brianosman@google.com>
Change-Id: I33ee0d8bcfd72c401823a2e7d5168c9ecc9a5181
Reviewed-on: https://skia-review.googlesource.com/129624
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/core/SkColorSpace_XYZ.cpp')
-rw-r--r-- | src/core/SkColorSpace_XYZ.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/core/SkColorSpace_XYZ.cpp b/src/core/SkColorSpace_XYZ.cpp index 6e5c7d8489..42b5b5d388 100644 --- a/src/core/SkColorSpace_XYZ.cpp +++ b/src/core/SkColorSpace_XYZ.cpp @@ -7,7 +7,7 @@ #include "SkColorSpace_XYZ.h" #include "SkColorSpacePriv.h" -#include "SkColorSpaceXform_Base.h" +#include "SkColorSpaceXformPriv.h" #include "SkOpts.h" SkColorSpace_XYZ::SkColorSpace_XYZ(SkGammaNamed gammaNamed, const SkMatrix44& toXYZD50) @@ -103,23 +103,6 @@ sk_sp<SkColorSpace> SkColorSpace_XYZ::makeColorSpin() const { return sk_sp<SkColorSpace>(new SkColorSpace_XYZ(fGammaNamed, fGammas, spin, fProfileData)); } -void SkColorSpace_XYZ::toDstGammaTables(const uint8_t* tables[3], sk_sp<SkData>* storage, - int numTables) const { - fToDstGammaOnce([this, numTables] { - const bool gammasAreMatching = numTables <= 1; - fDstStorage = - SkData::MakeUninitialized(numTables * SkColorSpaceXform_Base::kDstGammaTableSize); - SkColorSpaceXform_Base::BuildDstGammaTables(fToDstGammaTables, - (uint8_t*) fDstStorage->writable_data(), this, - gammasAreMatching); - }); - - *storage = fDstStorage; - tables[0] = fToDstGammaTables[0]; - tables[1] = fToDstGammaTables[1]; - tables[2] = fToDstGammaTables[2]; -} - sk_sp<SkColorSpace> SkColorSpace_XYZ::makeNonlinearBlending() const { if (this->nonlinearBlending()) { return sk_ref_sp(const_cast<SkColorSpace_XYZ*>(this)); |