diff options
| author |  msarett <msarett@google.com> | 2016-09-13 09:04:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-13 09:04:11 -0700 |
| commit | f7eb6fc71abd7649d65a877e7a10d1060afc0c88 (patch) | |
| tree | 873bfaad147f112a8963a016c0cf640faeafde4c /src/codec/SkBmpStandardCodec.cpp | |
| parent | f06e5183004fb3c43b6cc4cb3b4140443d99b8e6 (diff) | |
Implement Fill() for incomplete decodes to RGBA_F16
Before this patch, we would hit an SkASSERT(false).
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2335203002
Review-Url: https://codereview.chromium.org/2335203002
Diffstat (limited to 'src/codec/SkBmpStandardCodec.cpp')
| -rw-r--r-- | src/codec/SkBmpStandardCodec.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp index 089e3105c2..7d67d18c8f 100644 --- a/src/codec/SkBmpStandardCodec.cpp +++ b/src/codec/SkBmpStandardCodec.cpp @@ -302,10 +302,11 @@ void SkBmpStandardCodec::decodeIcoMask(SkStream* stream, const SkImageInfo& dstI } } -uint32_t SkBmpStandardCodec::onGetFillValue(SkColorType colorType) const { +uint64_t SkBmpStandardCodec::onGetFillValue(const SkImageInfo& dstInfo) const { const SkPMColor* colorPtr = get_color_ptr(fColorTable.get()); if (colorPtr) { - return get_color_table_fill_value(colorType, colorPtr, 0); + return get_color_table_fill_value(dstInfo.colorType(), dstInfo.alphaType(), colorPtr, 0, + nullptr); } - return INHERITED::onGetFillValue(colorType); + return INHERITED::onGetFillValue(dstInfo); } |