diff options
| author |  Leon Scroggins <scroggo@google.com> | 2017-07-11 17:35:31 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-11 18:00:31 +0000 |
| commit | 571b30f6117eede6d64cd2b924dc1f6aaa59e70e (patch) | |
| tree | a617b52ab7728fc7b2324fef75a0775438d94d71 /src/codec/SkPngCodec.h | |
| parent | f778eb2f51572d57a75e1a9cec25d5495f6662e1 (diff) | |
Reland "Remove support for decoding to kIndex_8"
Original change's description:
> > 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>
>
> TBR=djsollen@google.com,scroggo@google.com
>
> Change-Id: I1bc669441f250690884e75a9a61427fdf75c6907
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:6828
> Reviewed-on: https://skia-review.googlesource.com/22120
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Leon Scroggins <scroggo@google.com>
TBR=djsollen@google.com,scroggo@google.com
Bug: skia:6828
Change-Id: I36ff5a11c529d29e8adc95f43b8edc6fd1dbf5b8
Reviewed-on: https://skia-review.googlesource.com/22320
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkPngCodec.h')
| -rw-r--r-- | src/codec/SkPngCodec.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/codec/SkPngCodec.h b/src/codec/SkPngCodec.h index b329fef1b6..25a5f07877 100644 --- a/src/codec/SkPngCodec.h +++ b/src/codec/SkPngCodec.h @@ -47,7 +47,7 @@ protected: SkPngCodec(const SkEncodedInfo&, const SkImageInfo&, SkStream*, SkPngChunkReader*, void* png_ptr, void* info_ptr, int bitDepth); - Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMColor*, int*, int*) + Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, int*) override; SkEncodedImageFormat onGetEncodedFormat() const override { return SkEncodedImageFormat::kPNG; } bool onRewind() override; @@ -73,8 +73,7 @@ protected: void processData(); Result onStartIncrementalDecode(const SkImageInfo& dstInfo, void* pixels, size_t rowBytes, - const SkCodec::Options&, - SkPMColor* ctable, int* ctableCount) override; + const SkCodec::Options&) override; Result onIncrementalDecode(int*) override; sk_sp<SkPngChunkReader> fPngChunkReader; @@ -101,10 +100,9 @@ private: kSwizzleColor_XformMode, }; - bool createColorTable(const SkImageInfo& dstInfo, int* ctableCount); + bool createColorTable(const SkImageInfo& dstInfo); // Helper to set up swizzler, color xforms, and color table. Also calls png_read_update_info. - SkCodec::Result initializeXforms(const SkImageInfo& dstInfo, const Options&, - SkPMColor* colorPtr, int* colorCount); + SkCodec::Result initializeXforms(const SkImageInfo& dstInfo, const Options&); void initializeSwizzler(const SkImageInfo& dstInfo, const Options&, bool skipFormatConversion); void allocateStorage(const SkImageInfo& dstInfo); void destroyReadStruct(); |