diff options
| author |  Mike Klein <mtklein@google.com> | 2018-05-23 00:06:33 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-23 00:06:46 +0000 |
| commit | e60ae82dec8c5dac7997233b17dabdbf677de7da (patch) | |
| tree | 39c01598ab9c4e6731421aca867ab09125763d92 /src/codec | |
| parent | bb08eb2ede89787fb506799f4643d0bf29d72c2d (diff) | |
Revert "start cleaning up non-skcms SkColorSpaceXforms"
This reverts commit 339133f82c30cd3080672db28e6f72c894cba05a.
Reason for revert: broke NinePatchDrawableTest.testGetPadding? stranger things have happened.
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>
TBR=mtklein@chromium.org,brianosman@google.com
Change-Id: I9e76195481b8658b34936aeece278d81c286c0fa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/129680
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/SkCodec.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp index bf12ad2625..f67e6c06d3 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 "SkColorSpaceXformPriv.h" +#include "SkColorSpaceXform_Base.h" #include "SkData.h" #include "SkFrameHolder.h" #include "SkGifCodec.h" @@ -657,9 +657,8 @@ 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 = SkMakeColorSpaceXform(fSrcInfo.colorSpace(), - dstInfo.colorSpace(), - premulBehavior); + fColorXform = SkColorSpaceXform_Base::New(fSrcInfo.colorSpace(), dstInfo.colorSpace(), + premulBehavior); if (!fColorXform) { return false; } |