aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/codec/SkBmpMaskCodec.h
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-02-12 13:07:15 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-12 13:07:15 -0800
commitc7578b6cdd03b61f076ffc7956efd952d6c301c0 (patch)
tree8a3618f653636727d677e2057d1c7d93567a27b7 /src/codec/SkBmpMaskCodec.h
parentdae774eff41b36ae6511450d458060dd3d031689 (diff)
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 Review URL: https://codereview.chromium.org/1695473002
Diffstat (limited to 'src/codec/SkBmpMaskCodec.h')
-rw-r--r--src/codec/SkBmpMaskCodec.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/codec/SkBmpMaskCodec.h b/src/codec/SkBmpMaskCodec.h
index 73a8b3799d..93b3bca5a0 100644
--- a/src/codec/SkBmpMaskCodec.h
+++ b/src/codec/SkBmpMaskCodec.h
@@ -44,7 +44,6 @@ protected:
private:
- bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& options);
SkSampler* getSampler(bool createIfNecessary) override {
SkASSERT(fMaskSwizzler);
return fMaskSwizzler;