diff options
| author |  Herb Derby <herb@google.com> | 2017-11-16 14:38:57 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-17 19:10:16 +0000 |
| commit | 7ceb0b89f4030a13421ce28b2da1573c6846cf90 (patch) | |
| tree | 2bf3686248e8e539bc282ba8ab200ac67d6d1ae2 /tests/SkGaussFilterTest.cpp | |
| parent | 28db288ec26bf01e203183acffb4cbd683de322f (diff) | |
Remove api call from SkGaussFilter
Simplify the SkGaussFilter API to facilitate using
ranged-for loops.
Change-Id: Id853bd6bfe342ae95b7c6248c459fbf865f75d1e
Reviewed-on: https://skia-review.googlesource.com/73262
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'tests/SkGaussFilterTest.cpp')
| -rw-r--r-- | tests/SkGaussFilterTest.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/SkGaussFilterTest.cpp b/tests/SkGaussFilterTest.cpp index 2fdf4ac573..149260b3a3 100644 --- a/tests/SkGaussFilterTest.cpp +++ b/tests/SkGaussFilterTest.cpp @@ -32,9 +32,12 @@ DEF_TEST(SkGaussFilterCommon, r) { double sigma; SkGaussFilter::Type type; std::vector<double> golden; std::tie(sigma, type, golden) = test; SkGaussFilter filter{sigma, type}; - double result[5]; - size_t n = filter.filterDouble(result); - REPORTER_ASSERT(r, n == golden.size()); + double result[SkGaussFilter::kGaussArrayMax]; + int n = 0; + for (auto d : filter) { + result[n++] = d; + } + REPORTER_ASSERT(r, static_cast<size_t>(n) == golden.size()); double sum = careful_add(n, result); REPORTER_ASSERT(r, sum == 1.0); for (size_t i = 0; i < golden.size(); i++) { @@ -70,9 +73,12 @@ DEF_TEST(SkGaussFilterSweep, r) { const double maxSigma = nextafter(2.0, 0.0); auto check = [&](double sigma, SkGaussFilter::Type type) { SkGaussFilter filter{sigma, type}; - double result[5]; - int n = filter.filterDouble(result); - REPORTER_ASSERT(r, n <= 5); + double result[SkGaussFilter::kGaussArrayMax]; + int n = 0; + for (auto d : filter) { + result[n++] = d; + } + REPORTER_ASSERT(r, n <= SkGaussFilter::kGaussArrayMax); double sum = careful_add(n, result); REPORTER_ASSERT(r, sum == 1.0); }; |