From 7ceb0b89f4030a13421ce28b2da1573c6846cf90 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Thu, 16 Nov 2017 14:38:57 -0500 Subject: 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 Commit-Queue: Ben Wagner Commit-Queue: Herb Derby --- tests/SkGaussFilterTest.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'tests/SkGaussFilterTest.cpp') 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 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(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); }; -- cgit v1.2.3