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/SkBmpCodec.h | |
| 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/SkBmpCodec.h')
| -rw-r--r-- | src/codec/SkBmpCodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkBmpCodec.h b/src/codec/SkBmpCodec.h index 75740f76ff..e956a9fc40 100644 --- a/src/codec/SkBmpCodec.h +++ b/src/codec/SkBmpCodec.h @@ -106,7 +106,6 @@ protected: const SkCodec::Options& options, SkPMColor inputColorPtr[], int* inputColorCount); - void applyColorXform(const SkImageInfo& dstInfo, void* dst, void* src) const; uint32_t* xformBuffer() const { return fXformBuffer.get(); } void resetXformBuffer(int count) { fXformBuffer.reset(new uint32_t[count]); } @@ -115,6 +114,7 @@ protected: * than RGBA. */ static const SkColorType kXformSrcColorType = kBGRA_8888_SkColorType; + static const auto kXformSrcColorFormat = SkColorSpaceXform::kBGRA_8888_ColorFormat; private: |