diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-27 16:14:03 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-27 16:14:03 +0000 |
| commit | 7ce661d19c5cf4484305a1b20c44bd111f129847 (patch) | |
| tree | f92424e3d513b3f002481b2c66985113725cf488 /samplecode | |
| parent | 45891b8e37e131b8298f64ff81b80999ba23b8d6 (diff) | |
Blur refactoring
https://codereview.chromium.org/21835004/
git-svn-id: http://skia.googlecode.com/svn/trunk@10936 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleAll.cpp | 11 | ||||
| -rw-r--r-- | samplecode/SampleXfermodesBlur.cpp | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 01fbe0f8ec..de99be70cb 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -80,7 +80,8 @@ private: static void r0(SkLayerRasterizer* rast, SkPaint& p) { p.setMaskFilter(SkBlurMaskFilter::Create(SkIntToScalar(3), - SkBlurMaskFilter::kNormal_BlurStyle))->unref(); + SkBlurMaskFilter::kNormal_BlurStyle, + SkBlurMaskFilter::kNone_BlurFlag))->unref(); rast->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); p.setMaskFilter(NULL); @@ -254,7 +255,10 @@ static void apply_shader(SkPaint* paint, int index) { #if 1 SkScalar dir[] = { SK_Scalar1, SK_Scalar1, SK_Scalar1 }; - paint->setMaskFilter(SkBlurMaskFilter::CreateEmboss(dir, SK_Scalar1/4, SkIntToScalar(4), SkIntToScalar(3)))->unref(); + paint->setMaskFilter(SkBlurMaskFilter::CreateEmboss(dir, + SK_Scalar1/4, + SkIntToScalar(4), + SkIntToScalar(3)))->unref(); paint->setColor(SK_ColorBLUE); #endif } @@ -383,8 +387,7 @@ protected: light.fAmbient = 0x48; light.fSpecular = 0x80; SkScalar radius = SkIntToScalar(12)/5; - SkEmbossMaskFilter* embossFilter = new SkEmbossMaskFilter(light, - radius); + SkEmbossMaskFilter* embossFilter = new SkEmbossMaskFilter(light, radius); SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode); SkColorFilter* lightingFilter = SkColorFilter::CreateLightingFilter( diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp index ec5909b06c..a4ca9e7952 100644 --- a/samplecode/SampleXfermodesBlur.cpp +++ b/samplecode/SampleXfermodesBlur.cpp @@ -46,7 +46,8 @@ class XfermodesBlurView : public SampleView { void draw_mode(SkCanvas* canvas, SkXfermode* mode, int alpha, SkScalar x, SkScalar y) { SkPaint p; - SkMaskFilter* mf = SkBlurMaskFilter::Create(5, SkBlurMaskFilter::kNormal_BlurStyle, 0); + SkMaskFilter* mf = SkBlurMaskFilter::Create(5, SkBlurMaskFilter::kNormal_BlurStyle, + SkBlurMaskFilter::kNone_BlurFlag); p.setMaskFilter(mf)->unref(); SkScalar ww = SkIntToScalar(W); |