| Index: src/codec/SkBmpMaskCodec.h
|
| diff --git a/src/codec/SkBmpMaskCodec.h b/src/codec/SkBmpMaskCodec.h
|
| index 0b1291266d3fa140f0c7601649e669432868d9a0..26eadd1a47b99128aa653a7cc97009820e574678 100644
|
| --- a/src/codec/SkBmpMaskCodec.h
|
| +++ b/src/codec/SkBmpMaskCodec.h
|
| @@ -36,7 +36,7 @@ protected:
|
|
|
| Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
|
| size_t dstRowBytes, const Options&, SkPMColor*,
|
| - int*) override;
|
| + int*, int*) override;
|
|
|
| SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
|
| const SkCodec::Options& options, SkPMColor inputColorPtr[],
|
| @@ -46,8 +46,8 @@ private:
|
|
|
| bool initializeSwizzler(const SkImageInfo& dstInfo);
|
|
|
| - Result decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
|
| - const Options& opts) override;
|
| + uint32_t decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
|
| + const Options& opts) override;
|
|
|
| SkAutoTDelete<SkMasks> fMasks; // owned
|
| SkAutoTDelete<SkMaskSwizzler> fMaskSwizzler;
|
|
|