diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-06-05 15:53:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-05 20:14:57 +0000 |
| commit | c6e6a5f45e54006e861275a6d5c165830f403dcd (patch) | |
| tree | 3d4bc3a0c43d6c2986728a3dffdec43e8547f43f /src/codec/SkIcoCodec.cpp | |
| parent | 348060fa820e1ee7a4fd246afe517a80a9ef311d (diff) | |
Simplify SkCodecs' call to SkColorSpaceXform::apply
Most SkCodec subclasses did the following to apply their
SkColorSpaceXform:
dstFormat = select_xform_format(dstInfo.colorType());
srcFormat = select_xform_format(<something that doesn't change>);
xformAlphaType = select_xform_alpha(dstInfo.alphaType(),
this->getInfo().alphaType());
this->colorXform()->apply(dstFormat, dst, srcFormat, src, width,
xformAlphaType);
Consolidate the computation of these parameters into SkCodec and add a
new method to SkCodec that calls apply() with those parameters.
Add a SkColorSpaceXform::ColorFormat to SkCodec. This allows the new
method SkCodec::applyColorXform to supply the ColorFormat.
TBR=reed@google.com
(No change to public API.)
Change-Id: I8ea7ba4c0024be827a9f9359796c778744330f6e
Reviewed-on: https://skia-review.googlesource.com/18523
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkIcoCodec.cpp')
| -rw-r--r-- | src/codec/SkIcoCodec.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/codec/SkIcoCodec.cpp b/src/codec/SkIcoCodec.cpp index 9d424f3e4e..14c6fc49e7 100644 --- a/src/codec/SkIcoCodec.cpp +++ b/src/codec/SkIcoCodec.cpp @@ -192,7 +192,10 @@ SkCodec* SkIcoCodec::NewFromStream(SkStream* stream) { SkIcoCodec::SkIcoCodec(int width, int height, const SkEncodedInfo& info, SkTArray<std::unique_ptr<SkCodec>, true>* codecs, sk_sp<SkColorSpace> colorSpace) - : INHERITED(width, height, info, nullptr, std::move(colorSpace)) + // The source SkColorSpaceXform::ColorFormat will not be used. The embedded + // codec's will be used instead. + : INHERITED(width, height, info, SkColorSpaceXform::ColorFormat(), nullptr, + std::move(colorSpace)) , fEmbeddedCodecs(codecs) , fCurrScanlineCodec(nullptr) , fCurrIncrementalCodec(nullptr) |