From 571b30f6117eede6d64cd2b924dc1f6aaa59e70e Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Tue, 11 Jul 2017 17:35:31 +0000 Subject: 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 > > Commit-Queue: Leon Scroggins > > 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 > Commit-Queue: Leon Scroggins 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 Commit-Queue: Leon Scroggins --- bench/CodecBench.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bench/CodecBench.cpp') diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp index a1788ee0cc..f72294e246 100644 --- a/bench/CodecBench.cpp +++ b/bench/CodecBench.cpp @@ -51,20 +51,17 @@ void CodecBench::onDelayedSetup() { void CodecBench::onDraw(int n, SkCanvas* canvas) { std::unique_ptr codec; - SkPMColor colorTable[256]; - int colorCount; SkCodec::Options options; if (FLAGS_zero_init) { options.fZeroInitialized = SkCodec::kYes_ZeroInitialized; } for (int i = 0; i < n; i++) { - colorCount = 256; codec.reset(SkCodec::NewFromData(fData)); #ifdef SK_DEBUG const SkCodec::Result result = #endif codec->getPixels(fInfo, fPixelStorage.get(), fInfo.minRowBytes(), - &options, colorTable, &colorCount); + &options); SkASSERT(result == SkCodec::kSuccess || result == SkCodec::kIncompleteInput); } -- cgit v1.2.3