Index: src/codec/SkCodec_libgif.h |
diff --git a/src/codec/SkCodec_libgif.h b/src/codec/SkCodec_libgif.h |
index f777e58094fc044243d3f4b602fe9a53af187b40..10fdac97f9141c109c10d0adfb0efd20c8eb1139 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,10 @@ protected: |
bool onRewind() override; |
+ uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override; |
+ |
+ int onOutputScanline(int inputScanline) const; |
+ |
private: |
/* |
@@ -129,23 +133,23 @@ private: |
*/ |
Result initializeSwizzler(const SkImageInfo& dstInfo, ZeroInitialized zeroInit); |
- SkSampler* getSampler() override { return fSwizzler; } |
+ SkSampler* getSampler(bool createIfNecessary) override { |
+ SkASSERT(fSwizzler); |
+ return fSwizzler; |
+ } |
/* |
- * @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; |
+ int onGetScanlines(void* dst, int count, size_t rowBytes) override; |
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 |