Index: src/codec/SkCodec_wbmp.h |
diff --git a/src/codec/SkCodec_wbmp.h b/src/codec/SkCodec_wbmp.h |
index 220570b0db790c8f7b8cb6ffb1d3c1f928938056..5fce867981b08d5e61abe01e67ecc9122d3124fb 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: |
/* |
@@ -37,7 +37,7 @@ private: |
/* |
* Read a src row from the encoded stream |
*/ |
- Result readRow(uint8_t* row); |
+ bool readRow(uint8_t* row); |
SkWbmpCodec(const SkImageInfo&, SkStream*); |
@@ -49,7 +49,7 @@ private: |
SkAutoTMalloc<uint8_t> fSrcBuffer; |
// FIXME: Override onSkipScanlines to avoid swizzling. |
- Result onGetScanlines(void* dst, int count, size_t dstRowBytes) override; |
+ uint32_t onGetScanlines(void* dst, int count, size_t dstRowBytes) override; |
Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options, |
SkPMColor inputColorTable[], int* inputColorCount) override; |