diff options
| author |  Matt Sarett <msarett@google.com> | 2017-03-23 15:32:25 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-24 13:19:53 +0000 |
| commit | cf3f2347c8933596aeba873d4ece597a9339392f (patch) | |
| tree | d340f5802bb11ffe902b5f95ea06c6b75c5ccd74 /src/codec/SkGifCodec.cpp | |
| parent | a3bdd44aff94974e720ed04b860fbfe24f8f431e (diff) | |
Add SkTransferFunctionBehavior flag: Use in codec and encoder
This is a step towards removing the non-linear blending flag from
SkColorSpace. The flag on SkColorSpace used to control the premul
behavior - now it is controlled by this option.
BUG=skia:
Change-Id: Ia29bd8c2b0596a93c6aa14332dcd9bd39e388a90
Reviewed-on: https://skia-review.googlesource.com/10008
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/codec/SkGifCodec.cpp')
| -rw-r--r-- | src/codec/SkGifCodec.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/codec/SkGifCodec.cpp b/src/codec/SkGifCodec.cpp index 2903717b48..a70f7be14e 100644 --- a/src/codec/SkGifCodec.cpp +++ b/src/codec/SkGifCodec.cpp @@ -183,7 +183,9 @@ void SkGifCodec::initializeColorTable(const SkImageInfo& dstInfo, size_t frameIn SkCodec::Result SkGifCodec::prepareToDecode(const SkImageInfo& dstInfo, SkPMColor* inputColorPtr, int* inputColorCount, const Options& opts) { // Check for valid input parameters - if (!conversion_possible(dstInfo, this->getInfo()) || !this->initializeColorXform(dstInfo)) { + if (!conversion_possible(dstInfo, this->getInfo()) || + !this->initializeColorXform(dstInfo, opts.fPremulBehavior)) + { return gif_error("Cannot convert input type to output type.\n", kInvalidConversion); } |