diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-07-10 11:51:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-10 17:06:48 +0000 |
| commit | 742a3e298fda669006147e4a305bab8452369b1f (patch) | |
| tree | 6b5ceb03ecdfbc3f3e86f16357207a67e82acb99 /src/codec/SkIcoCodec.h | |
| parent | da1893fe3a654b551516ce706a363eebf8471511 (diff) | |
Remove support for decoding to kIndex_8
Fix up callsites, and remove tests that no longer make sense.
Bug: skia:6828
Change-Id: I2548c4b7528b7b1be7412563156f27b52c9d4295
Reviewed-on: https://skia-review.googlesource.com/21664
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkIcoCodec.h')
| -rw-r--r-- | src/codec/SkIcoCodec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/codec/SkIcoCodec.h b/src/codec/SkIcoCodec.h index 2a4efb50b0..9f2457aa0d 100644 --- a/src/codec/SkIcoCodec.h +++ b/src/codec/SkIcoCodec.h @@ -40,7 +40,7 @@ protected: * Initiates the Ico decode */ Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options&, - SkPMColor*, int*, int*) override; + int*) override; SkEncodedImageFormat onGetEncodedFormat() const override { return SkEncodedImageFormat::kICO; @@ -50,15 +50,15 @@ protected: private: - Result onStartScanlineDecode(const SkImageInfo& dstInfo, const SkCodec::Options& options, - SkPMColor inputColorPtr[], int* inputColorCount) override; + Result onStartScanlineDecode(const SkImageInfo& dstInfo, + const SkCodec::Options& options) override; int onGetScanlines(void* dst, int count, size_t rowBytes) override; bool onSkipScanlines(int count) override; Result onStartIncrementalDecode(const SkImageInfo& dstInfo, void* pixels, size_t rowBytes, - const SkCodec::Options&, SkPMColor*, int*) override; + const SkCodec::Options&) override; Result onIncrementalDecode(int* rowsDecoded) override; |