aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/codec/SkCodec.cpp
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2016-11-04 13:19:48 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-04 20:55:16 +0000
commit61eedebe4ce61215a56ced832e0df73c2cb19447 (patch)
tree869f208f74b8966e8f0153edd6fe323d37adfbf6 /src/codec/SkCodec.cpp
parent125b2aac5a38121b3c82545acd27e74366ca83aa (diff)
Add F16, SkColorSpaceXform support to SkGifCodec
BUG=skia:4895 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4396 Change-Id: I7c521760891852daf4f3933ecf02dc08acec64c0 Reviewed-on: https://skia-review.googlesource.com/4396 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/codec/SkCodec.cpp')
-rw-r--r--src/codec/SkCodec.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index 2673d2ea9f..739c9cd673 100644
--- a/src/codec/SkCodec.cpp
+++ b/src/codec/SkCodec.cpp
@@ -472,7 +472,8 @@ void SkCodec::fillIncompleteImage(const SkImageInfo& info, void* dst, size_t row
bool SkCodec::initializeColorXform(const SkImageInfo& dstInfo) {
fColorXform = nullptr;
- if (needs_color_xform(dstInfo, fSrcInfo)) {
+ bool needsPremul = needs_premul(dstInfo, fEncodedInfo);
+ if (needs_color_xform(dstInfo, fSrcInfo, needsPremul)) {
fColorXform = SkColorSpaceXform::New(fSrcInfo.colorSpace(), dstInfo.colorSpace());
if (!fColorXform) {
return false;