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/android | |
| 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/android')
| -rw-r--r-- | src/android/SkBitmapRegionCodec.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/android/SkBitmapRegionCodec.cpp b/src/android/SkBitmapRegionCodec.cpp index 9c21484ec5..df0a32ca31 100644 --- a/src/android/SkBitmapRegionCodec.cpp +++ b/src/android/SkBitmapRegionCodec.cpp @@ -135,5 +135,8 @@ bool SkBitmapRegionCodec::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocat } bool SkBitmapRegionCodec::conversionSupported(SkColorType colorType) { - return conversion_possible(fCodec->getInfo().makeColorType(colorType), fCodec->getInfo()); + // Enable legacy behavior. + sk_sp<SkColorSpace> colorSpace = nullptr; + SkImageInfo dstInfo = fCodec->getInfo().makeColorType(colorType).makeColorSpace(colorSpace); + return conversion_possible_ignore_color_space(dstInfo, fCodec->getInfo()); } |