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

Unified Diff: src/codec/SkBmpStandardCodec.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/SkBmpStandardCodec.h
diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h
index 0d81cbfee4be6544e679d018526955c288f386bf..06f351506c11d94eec643dd9504a70063324f32c 100644
--- a/src/codec/SkBmpStandardCodec.h
+++ b/src/codec/SkBmpStandardCodec.h
@@ -44,7 +44,7 @@ protected:
Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
size_t dstRowBytes, const Options&, SkPMColor*,
- int*) override;
+ int*, int*) override;
bool onInIco() const override {
return fInIco;
@@ -54,6 +54,8 @@ protected:
const SkCodec::Options& options, SkPMColor inputColorPtr[],
int* inputColorCount) override;
+ uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override;
+
private:
/*
@@ -64,8 +66,8 @@ private:
bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts);
- Result decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
- const Options& opts) override;
+ uint32_t decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+ const Options& opts) override;
Result decodeIcoMask(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);

Powered by Google App Engine
This is Rietveld 408576698