diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-28 16:25:35 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-28 16:25:35 +0000 |
| commit | e396455d2d60ddf8e625b5037254f3c09fbcdcf5 (patch) | |
| tree | 9654912812c8b942b89124b1ae2aa36372818663 /tests/BlurTest.cpp | |
| parent | 2e0c32af0508a1e544c9953ea2fe128dbae7d429 (diff) | |
move common blur types into central header
BUG=skia:
R=scroggo@google.com, djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/253833002
git-svn-id: http://skia.googlecode.com/svn/trunk@14411 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/BlurTest.cpp')
| -rw-r--r-- | tests/BlurTest.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 1e9f31479b..028b509b51 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -103,9 +103,8 @@ static void test_blur_drawing(skiatest::Reporter* reporter) { paint.setStrokeWidth(SkIntToScalar(strokeWidth)); SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)); - for (int style = 0; style < SkBlurMaskFilter::kBlurStyleCount; ++style) { - SkBlurMaskFilter::BlurStyle blurStyle = - static_cast<SkBlurMaskFilter::BlurStyle>(style); + for (int style = 0; style <= kLastEnum_SkBlurStyle; ++style) { + SkBlurStyle blurStyle = static_cast<SkBlurStyle>(style); const uint32_t flagPermutations = SkBlurMaskFilter::kAll_BlurFlag; for (uint32_t flags = 0; flags < flagPermutations; ++flags) { @@ -169,7 +168,7 @@ static void ground_truth_2d(int width, int height, memset(src.fImage, 0xff, src.computeTotalImageSize()); dst.fImage = NULL; - SkBlurMask::BlurGroundTruth(sigma, &dst, src, SkBlurMask::kNormal_Style); + SkBlurMask::BlurGroundTruth(sigma, &dst, src, kNormal_SkBlurStyle); int midX = dst.fBounds.centerX(); int midY = dst.fBounds.centerY(); @@ -231,7 +230,7 @@ static void blur_path(SkCanvas* canvas, const SkPath& path, SkPaint blurPaint; blurPaint.setColor(SK_ColorWHITE); - SkMaskFilter* filter = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle, + SkMaskFilter* filter = SkBlurMaskFilter::Create(kNormal_SkBlurStyle, gaussianSigma, SkBlurMaskFilter::kHighQuality_BlurFlag); blurPaint.setMaskFilter(filter)->unref(); |