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 /bench | |
| 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 'bench')
| -rw-r--r-- | bench/CodecBench.cpp | 5 | ||||
| -rw-r--r-- | bench/CodecBenchPriv.h | 1 | ||||
| -rw-r--r-- | bench/nanobench.cpp | 8 |
3 files changed, 3 insertions, 11 deletions
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<SkCodec> 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); } diff --git a/bench/CodecBenchPriv.h b/bench/CodecBenchPriv.h index 5028573ad2..d0eead33e0 100644 --- a/bench/CodecBenchPriv.h +++ b/bench/CodecBenchPriv.h @@ -19,6 +19,7 @@ inline const char* color_type_to_str(SkColorType colorType) { case kGray_8_SkColorType: return "Gray8"; case kIndex_8_SkColorType: + SkASSERT(false); return "Index8"; case kAlpha_8_SkColorType: return "Alpha8"; diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 6c60aa81af..e67415e88c 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -630,7 +630,6 @@ public: if (!FLAGS_simpleCodec) { fColorTypes.push_back(kRGB_565_SkColorType); fColorTypes.push_back(kAlpha_8_SkColorType); - fColorTypes.push_back(kIndex_8_SkColorType); fColorTypes.push_back(kGray_8_SkColorType); } } @@ -859,13 +858,8 @@ public: const size_t rowBytes = info.minRowBytes(); SkAutoMalloc storage(info.getSafeSize(rowBytes)); - // Used if fCurrentColorType is kIndex_8_SkColorType - int colorCount = 256; - SkPMColor colors[256]; - const SkCodec::Result result = codec->getPixels( - info, storage.get(), rowBytes, nullptr, colors, - &colorCount); + info, storage.get(), rowBytes); switch (result) { case SkCodec::kSuccess: case SkCodec::kIncompleteInput: |