| Index: src/codec/SkBmpStandardCodec.h
|
| diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h
|
| index 0263570b8579fbb84be1e809bdd2d297ecbfbe63..e68cc754b16a59feae99750ef67f63f0f2814bd2 100644
|
| --- a/src/codec/SkBmpStandardCodec.h
|
| +++ b/src/codec/SkBmpStandardCodec.h
|
| @@ -44,7 +44,7 @@ protected:
|
|
|
| Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
|
| size_t dstRowBytes, const Options&, SkPMColor*,
|
| - int*) override;
|
| + int*, int*) override;
|
|
|
| bool onInIco() const override {
|
| return fInIco;
|
| @@ -54,6 +54,9 @@ protected:
|
| const SkCodec::Options& options, SkPMColor inputColorPtr[],
|
| int* inputColorCount) override;
|
|
|
| +
|
| + uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override;
|
| +
|
| SkSampler* getSampler() override { return fSwizzler; }
|
|
|
| private:
|
| @@ -66,8 +69,8 @@ private:
|
|
|
| bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts);
|
|
|
| - Result decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
|
| - const Options& opts) override;
|
| + int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
|
| + const Options& opts) override;
|
|
|
| Result decodeIcoMask(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
|
|
|
|
|