diff options
| author |  msarett <msarett@google.com> | 2016-09-08 11:55:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-08 11:55:16 -0700 |
| commit | 2ecc35ffa5feb56cd088478589ba1e48382b2e1f (patch) | |
| tree | 8c07d069af6b7095b0b0fb05519752c594556833 /src/codec/SkBmpRLECodec.cpp | |
| parent | 6a2b1941c1da272f704439e417f212932eed2004 (diff) | |
Checking for valid colorType, alphaType, colorSpace in SkCodec
* Refactor to share code between SkPngCodec and SkWebpCodec
* Didn't end up sharing with SkJpegCodec but did refactor
that code a bit
* Disallow conversions to F16 with non-linear color spaces
* Fail to decode if we fail to create a SkColorSpaceXform
(should be an assert soon). We used to fallback on a
legacy decode if we failed to create the transform.
* A bunch of name changes
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2319293003
Committed: https://skia.googlesource.com/skia/+/7a9900d6d34e437bb24beb5524a1f6488ae138c9
Review-Url: https://codereview.chromium.org/2319293003
Diffstat (limited to 'src/codec/SkBmpRLECodec.cpp')
| -rw-r--r-- | src/codec/SkBmpRLECodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkBmpRLECodec.cpp b/src/codec/SkBmpRLECodec.cpp index 02b42f6d90..252d63e352 100644 --- a/src/codec/SkBmpRLECodec.cpp +++ b/src/codec/SkBmpRLECodec.cpp @@ -44,7 +44,7 @@ SkCodec::Result SkBmpRLECodec::onGetPixels(const SkImageInfo& dstInfo, // Subsets are not supported. return kUnimplemented; } - if (!conversion_possible(dstInfo, this->getInfo())) { + if (!conversion_possible_ignore_color_space(dstInfo, this->getInfo())) { SkCodecPrintf("Error: cannot convert input type to output type.\n"); return kInvalidConversion; } |