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

Unified Diff: src/codec/SkCodec_wbmp.h

Issue 1332053002: Fill incomplete images in SkCodec parent class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase on merged SkCodec and SkScanlineDecoder Created 5 years, 3 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
Index: src/codec/SkCodec_wbmp.h
diff --git a/src/codec/SkCodec_wbmp.h b/src/codec/SkCodec_wbmp.h
index 220570b0db790c8f7b8cb6ffb1d3c1f928938056..e8855b164f8716e3a0eeffdf49bd5f57c97aad1f 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:
/*
@@ -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;

Powered by Google App Engine
This is Rietveld 408576698