diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-28 11:59:48 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-28 16:36:54 +0000 |
| commit | a2cedff029dcae604ce39b119d08c01ed6ad2ce8 (patch) | |
| tree | 861735fdb9e418758a304b6a436f18e6ae0f1d10 | |
| parent | d2adc66efec8a172b71bf5572fbedde064025825 (diff) | |
Fix gaussianedge GM
Change-Id: Ia4523ea13992b325cb59f42e4458a199c7a98c4b
Reviewed-on: https://skia-review.googlesource.com/10219
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | gm/gaussianedge.cpp | 7 | ||||
| -rw-r--r-- | gn/effects.gni | 2 | ||||
| -rw-r--r-- | src/effects/SkGaussianEdgeShader.h (renamed from include/effects/SkGaussianEdgeShader.h) | 0 | ||||
| -rw-r--r-- | src/ports/SkGlobalInitialization_default.cpp | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/gm/gaussianedge.cpp b/gm/gaussianedge.cpp index 7a451183cf..eca8495821 100644 --- a/gm/gaussianedge.cpp +++ b/gm/gaussianedge.cpp @@ -6,8 +6,9 @@ */ #include "gm.h" -#include "SkRRect.h" +#include "SkColorFilter.h" #include "SkGaussianEdgeShader.h" +#include "SkRRect.h" //#define VIZ 1 @@ -118,8 +119,10 @@ protected: SkPaint basePaint; basePaint.setAntiAlias(true); - basePaint.setShader(SkGaussianEdgeShader::Make()); basePaint.setColor(SkColorSetARGB(255, (4 * blurRad) >> 8, (4 * blurRad) & 0xff, 0)); + basePaint.setShader(SkGaussianEdgeShader::Make()); + basePaint.setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorRED, + SkBlendMode::kModulate)); //---- paints[0] = basePaint; diff --git a/gn/effects.gni b/gn/effects.gni index 3ae4ebec3e..cc2b8ed146 100644 --- a/gn/effects.gni +++ b/gn/effects.gni @@ -40,6 +40,7 @@ skia_effects_sources = [ "$_src/effects/SkEmbossMaskFilter.cpp", "$_src/effects/SkImageSource.cpp", "$_src/effects/SkGaussianEdgeShader.cpp", + "$_src/effects/SkGaussianEdgeShader.h", "$_src/effects/SkHighContrastFilter.cpp", "$_src/effects/SkLayerDrawLooper.cpp", "$_src/effects/SkLayerRasterizer.cpp", @@ -106,7 +107,6 @@ skia_effects_sources = [ "$_include/effects/SkDiscretePathEffect.h", "$_include/effects/SkDisplacementMapEffect.h", "$_include/effects/SkDropShadowImageFilter.h", - "$_include/effects/SkGaussianEdgeShader.h", "$_include/effects/SkGradientShader.h", "$_include/effects/SkImageSource.h", "$_include/effects/SkLayerDrawLooper.h", diff --git a/include/effects/SkGaussianEdgeShader.h b/src/effects/SkGaussianEdgeShader.h index ef54ece56e..ef54ece56e 100644 --- a/include/effects/SkGaussianEdgeShader.h +++ b/src/effects/SkGaussianEdgeShader.h diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index 97d3b671e6..df4dde30a6 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -23,8 +23,7 @@ #include "SkDisplacementMapEffect.h" #include "SkDropShadowImageFilter.h" #include "../../src/effects/SkEmbossMaskFilter.h" -#include "SkGaussianEdgeShader.h" -#include "SkRRectsGaussianEdgeMaskFilter.h" +#include "../../src/effects/SkGaussianEdgeShader.h" #include "SkGradientShader.h" #include "SkHighContrastFilter.h" #include "SkImageSource.h" @@ -44,6 +43,7 @@ #include "SkPaintImageFilter.h" #include "SkPerlinNoiseShader.h" #include "SkPictureImageFilter.h" +#include "SkRRectsGaussianEdgeMaskFilter.h" #include "SkTableColorFilter.h" #include "SkTileImageFilter.h" #include "SkXfermodeImageFilter.h" |