| commit | deabdb5b9712de9e3c6bbb9aa68ec2f20df80a8e | [log] [tgz] |
|---|---|---|
| author | msarett <msarett@google.com> | Fri Feb 12 15:00:10 2016 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Feb 12 15:00:10 2016 -0800 |
| tree | df8951bf09f0dc3b1926d082340f65c3e756100a | |
| parent | 3478f753ffc28a6f0f0877cc06be7373f960c527 [diff] [blame] |
Revert of Fix colorType/alphaType checks in SkCodec (patchset #5 id:80001 of https://codereview.chromium.org/1695473002/ ) Reason for revert: Really bad images in Gold. Original issue's description: > Fix colorType/alphaType checks in SkCodec > > Make getPixels() and startScanlineDecode() behave > consistently. > > Require that kGray8 decodes are opaque. > > Assert that creating the swizzler succeeds. > > BUG=skia:4203 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1695473002 > > Committed: https://skia.googlesource.com/skia/+/c7578b6cdd03b61f076ffc7956efd952d6c301c0 TBR=scroggo@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4203 Review URL: https://codereview.chromium.org/1694023002
diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h index 557f653..d3e2ed3 100644 --- a/src/codec/SkBmpStandardCodec.h +++ b/src/codec/SkBmpStandardCodec.h
@@ -72,7 +72,7 @@ */ bool createColorTable(SkAlphaType alphaType, int* colorCount); - void initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts); + bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts); int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options& opts) override;