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-22 18:19:35 +0000 |
| commit | 339133f82c30cd3080672db28e6f72c894cba05a (patch) | |
| tree | 633053374dd0d1684ce91da675721d8b3d7b6fad /src/codec | |
| parent | e81f7b393a390801a365e9b6646cc89ba86da33a (diff) | |
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>
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/SkCodec.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp index f67e6c06d3..bf12ad2625 100644 --- a/src/codec/SkCodec.cpp +++ b/src/codec/SkCodec.cpp @@ -9,7 +9,7 @@ #include "SkCodec.h" #include "SkCodecPriv.h" #include "SkColorSpace.h" -#include "SkColorSpaceXform_Base.h" +#include "SkColorSpaceXformPriv.h" #include "SkData.h" #include "SkFrameHolder.h" #include "SkGifCodec.h" @@ -657,8 +657,9 @@ bool SkCodec::initializeColorXform(const SkImageInfo& dstInfo, SkEncodedInfo::Al bool needsColorCorrectPremul = needs_premul(dstInfo.alphaType(), encodedAlpha) && SkTransferFunctionBehavior::kRespect == premulBehavior; if (needs_color_xform(dstInfo, fSrcInfo.colorSpace(), needsColorCorrectPremul)) { - fColorXform = SkColorSpaceXform_Base::New(fSrcInfo.colorSpace(), dstInfo.colorSpace(), - premulBehavior); + fColorXform = SkMakeColorSpaceXform(fSrcInfo.colorSpace(), + dstInfo.colorSpace(), + premulBehavior); if (!fColorXform) { return false; } |