| Index: src/codec/SkJpegCodec.h
|
| diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h
|
| index b86396317b90bd848a77a1c6ec6b35726d574745..6fe3ff5ee857b881ee7ee8876570b149667c8592 100644
|
| --- a/src/codec/SkJpegCodec.h
|
| +++ b/src/codec/SkJpegCodec.h
|
| @@ -50,7 +50,7 @@ protected:
|
| * Initiates the jpeg decode
|
| */
|
| Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options&,
|
| - SkPMColor*, int*) override;
|
| + SkPMColor*, int*, int*) override;
|
|
|
| SkEncodedFormat onGetEncodedFormat() const override {
|
| return kJPEG_SkEncodedFormat;
|
| @@ -112,8 +112,8 @@ private:
|
| Result initializeSwizzler(const SkImageInfo&, const SkCodec::Options&);
|
| Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options,
|
| SkPMColor ctable[], int* ctableCount) override;
|
| - Result onGetScanlines(void* dst, int count, size_t rowBytes) override;
|
| - Result onSkipScanlines(int count) override;
|
| + uint32_t onGetScanlines(void* dst, int count, size_t rowBytes) override;
|
| + bool onSkipScanlines(int count) override;
|
|
|
| SkAutoTDelete<JpegDecoderMgr> fDecoderMgr;
|
| // We will save the state of the decompress struct after reading the header.
|
|
|