diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-09 10:48:23 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-09 18:31:29 +0000 |
| commit | 89cb821e9e9033281a33394709a1feed7eb0523a (patch) | |
| tree | 4d1324c9a4e2f341d091268d987f8994cdc805f4 /gm/imagefiltersgraph.cpp | |
| parent | e94255d456ad86e045e0c3aeab57395566cf49a5 (diff) | |
Separate SkArithmeticImageFilter from SkXfermodeImageFilter.
Change-Id: I145eed7276456b546ca5c66bc1a0f0f74a84f138
Reviewed-on: https://skia-review.googlesource.com/6728
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/imagefiltersgraph.cpp')
| -rw-r--r-- | gm/imagefiltersgraph.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index fd4d5cf516..30c987aa86 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -7,6 +7,7 @@ #include "gm.h" +#include "SkArithmeticImageFilter.h" #include "SkBlurImageFilter.h" #include "SkColorFilter.h" #include "SkColorFilterImageFilter.h" @@ -14,13 +15,13 @@ #include "SkImage.h" #include "SkImageSource.h" #include "SkMatrixConvolutionImageFilter.h" +#include "SkMergeImageFilter.h" +#include "SkMorphologyImageFilter.h" #include "SkOffsetImageFilter.h" #include "SkReadBuffer.h" #include "SkSpecialImage.h" #include "SkSpecialSurface.h" #include "SkWriteBuffer.h" -#include "SkMergeImageFilter.h" -#include "SkMorphologyImageFilter.h" #include "SkXfermodeImageFilter.h" class ImageFiltersGraphGM : public skiagm::GM { @@ -88,11 +89,8 @@ protected: matrixFilter)); SkPaint paint; - paint.setImageFilter( - SkXfermodeImageFilter::MakeArithmetic(0, 1, 1, 0, true, - std::move(matrixFilter), - std::move(offsetFilter), - nullptr)); + paint.setImageFilter(SkArithmeticImageFilter::Make( + 0, 1, 1, 0, true, std::move(matrixFilter), std::move(offsetFilter), nullptr)); DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); |