| Index: src/codec/SkCodec_wbmp.h
|
| diff --git a/src/codec/SkCodec_wbmp.h b/src/codec/SkCodec_wbmp.h
|
| index 976a5a22f064432e127a4d917620813a8b2fa19c..a35fc063d4a2ccb1900287d94d9f8ba2d62ad993 100644
|
| --- a/src/codec/SkCodec_wbmp.h
|
| +++ b/src/codec/SkCodec_wbmp.h
|
| @@ -25,7 +25,7 @@ public:
|
| protected:
|
| SkEncodedFormat onGetEncodedFormat() const override;
|
| Result onGetPixels(const SkImageInfo&, void*, size_t,
|
| - const Options&, SkPMColor[], int*) override;
|
| + const Options&, SkPMColor[], int*, int*) override;
|
| bool onRewind() override;
|
| private:
|
| /*
|
| @@ -38,19 +38,19 @@ private:
|
| /*
|
| * Read a src row from the encoded stream
|
| */
|
| - Result readRow(uint8_t* row);
|
| + bool readRow(uint8_t* row);
|
|
|
| SkWbmpCodec(const SkImageInfo&, SkStream*);
|
|
|
| - const size_t fSrcRowBytes;
|
| + const size_t fSrcRowBytes;
|
| + SkAutoTDelete<SkSwizzler> fSwizzler;
|
|
|
| // Used for scanline decodes:
|
| SkAutoTUnref<SkColorTable> fColorTable;
|
| - SkAutoTDelete<SkSwizzler> fSwizzler;
|
| SkAutoTMalloc<uint8_t> fSrcBuffer;
|
|
|
| // FIXME: Override onSkipScanlines to avoid swizzling.
|
| - Result onGetScanlines(void* dst, int count, size_t dstRowBytes) override;
|
| + int onGetScanlines(void* dst, int count, size_t dstRowBytes) override;
|
| Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options,
|
| SkPMColor inputColorTable[], int* inputColorCount) override;
|
|
|
|
|