Chromium Code Reviews| Index: src/codec/SkCodec_libgif.h |
| diff --git a/src/codec/SkCodec_libgif.h b/src/codec/SkCodec_libgif.h |
| index d7dc2b9e1d401242d2c730f805a947b75ca31de0..7718e4d01129d00cb89b96395089ae32430b500e 100644 |
| --- a/src/codec/SkCodec_libgif.h |
| +++ b/src/codec/SkCodec_libgif.h |
| @@ -60,7 +60,7 @@ protected: |
| * Performs the full gif decode |
| */ |
| Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, |
| - SkPMColor*, int32_t*) override; |
| + SkPMColor*, int*, int*) override; |
| SkEncodedFormat onGetEncodedFormat() const override { |
| return kGIF_SkEncodedFormat; |
| @@ -68,6 +68,8 @@ protected: |
| bool onRewind() override; |
| + uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override; |
| + |
| private: |
| /* |
| @@ -125,20 +127,17 @@ private: |
| Result initializeSwizzler(const SkImageInfo& dstInfo, ZeroInitialized zeroInit); |
| /* |
| - * @return kSuccess if the read is successful and kIncompleteInput if the |
| - * read fails. |
| + * @return true if the read is successful and false if the read fails. |
| */ |
| - Result readRow(); |
| + bool readRow(); |
| Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& opts, |
| SkPMColor inputColorPtr[], int* inputColorCount) override; |
| - Result onGetScanlines(void* dst, int count, size_t rowBytes) override; |
| + uint32_t onGetScanlines(void* dst, int count, size_t rowBytes) override; |
|
scroggo
2015/10/01 20:48:58
More uint32_ts that should be converted to int to
msarett
2015/10/01 22:34:52
Yep there's a bunch
|
| SkScanlineOrder onGetScanlineOrder() const override; |
| - int onNextScanline() const override; |
| - |
| /* |
| * This function cleans up the gif object after the decode completes |
| * It is used in a SkAutoTCallIProc template |