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

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: Forgot to add SkSampler.cpp 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
Index: src/codec/SkCodec_wbmp.h
diff --git a/src/codec/SkCodec_wbmp.h b/src/codec/SkCodec_wbmp.h
index 976a5a22f064432e127a4d917620813a8b2fa19c..a35fc063d4a2ccb1900287d94d9f8ba2d62ad993 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:
/*
@@ -38,19 +38,19 @@ private:
/*
* Read a src row from the encoded stream
*/
- Result readRow(uint8_t* row);
+ bool readRow(uint8_t* row);
SkWbmpCodec(const SkImageInfo&, SkStream*);
- const size_t fSrcRowBytes;
+ const size_t fSrcRowBytes;
+ SkAutoTDelete<SkSwizzler> fSwizzler;
// Used for scanline decodes:
SkAutoTUnref<SkColorTable> fColorTable;
- SkAutoTDelete<SkSwizzler> fSwizzler;
SkAutoTMalloc<uint8_t> fSrcBuffer;
// FIXME: Override onSkipScanlines to avoid swizzling.
- Result onGetScanlines(void* dst, int count, size_t dstRowBytes) override;
+ int 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