diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-08-18 10:53:24 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-18 19:46:59 +0000 |
| commit | ae79f32e79e39d399d9e3ecdaf9e0fc360928989 (patch) | |
| tree | 6e697fc9323b9336ec05417f8aa922122d3ffece /src/codec/SkCodecPriv.h | |
| parent | 141df44fd82b5d9223025a5daa463fcf22d8416f (diff) | |
Call initializeColorXform inside SkCodec
Make initializeColorXform private, and only call in the base class.
Add virtual method to skip initializeColorXform, for classes that do
not need one.
Change SkCodec::FrameInfo's SkAlphaType to an SkEncodedInfo::Alpha.
This allows proper checking internally whether SkCodec needs to do a
color correct premultiply.
Depends on https://chromium-review.googlesource.com/c/620947, for this
API change.
(Separated from review.skia.org/25746)
Bug: skia:5609
Bug: skia:6839
Change-Id: Icb0d46659c546060c34d32eaf792c86708726c7a
Reviewed-on: https://skia-review.googlesource.com/35880
Reviewed-by: Chris Blume <cblume@chromium.org>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkCodecPriv.h')
| -rw-r--r-- | src/codec/SkCodecPriv.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/codec/SkCodecPriv.h b/src/codec/SkCodecPriv.h index a737fb7511..93d2925fc4 100644 --- a/src/codec/SkCodecPriv.h +++ b/src/codec/SkCodecPriv.h @@ -271,9 +271,8 @@ static inline PackColorProc choose_pack_color_proc(bool isPremul, SkColorType co } } -static inline bool needs_premul(const SkImageInfo& dstInfo, const SkEncodedInfo& encodedInfo) { - return kPremul_SkAlphaType == dstInfo.alphaType() && - SkEncodedInfo::kUnpremul_Alpha == encodedInfo.alpha(); +static inline bool needs_premul(SkAlphaType dstAT, SkEncodedInfo::Alpha encodedAlpha) { + return kPremul_SkAlphaType == dstAT && SkEncodedInfo::kUnpremul_Alpha == encodedAlpha; } static inline bool needs_color_xform(const SkImageInfo& dstInfo, const SkColorSpace* srcCS, |