diff options
| author |  Leon Scroggins <scroggo@google.com> | 2017-07-10 19:51:46 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-10 19:51:59 +0000 |
| commit | 8321f7585b6aded0c35e50e9af8709b25fdce3f6 (patch) | |
| tree | 9a9e3a1843c8864a9e847d0c7b59b987946f6b24 /bench/nanobench.cpp | |
| parent | a48ae6ec2feb32e3d781ad43353209a90059a01d (diff) | |
Revert "Remove support for decoding to kIndex_8"
This reverts commit 742a3e298fda669006147e4a305bab8452369b1f.
Reason for revert: Breaking Android roll:
frameworks/base/core/jni/android/graphics/BitmapFactory.cpp:453:18: error: no member named 'fColorPtr' in 'SkAndroidCodec::AndroidOptions'
codecOptions.fColorPtr = colorPtr;
~~~~~~~~~~~~ ^
frameworks/base/core/jni/android/graphics/BitmapFactory.cpp:454:18: error: no member named 'fColorCount' in 'SkAndroidCodec::AndroidOptions'
codecOptions.fColorCount = colorCount;
~~~~~~~~~~~~ ^
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>
Diffstat (limited to 'bench/nanobench.cpp')
| -rw-r--r-- | bench/nanobench.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index e67415e88c..6c60aa81af 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -630,6 +630,7 @@ 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); } } @@ -858,8 +859,13 @@ 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); + info, storage.get(), rowBytes, nullptr, colors, + &colorCount); switch (result) { case SkCodec::kSuccess: case SkCodec::kIncompleteInput: |