Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: src/codec/SkCodec_libgif.h

Issue 1332053002: Fill incomplete images in SkCodec parent class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Use aligned memory in swizzler test Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/codec/SkCodecPriv.h ('k') | src/codec/SkCodec_libgif.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « src/codec/SkCodecPriv.h ('k') | src/codec/SkCodec_libgif.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698