diff options
Diffstat (limited to 'gm/testimagefilters.cpp')
-rw-r--r-- | gm/testimagefilters.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gm/testimagefilters.cpp b/gm/testimagefilters.cpp index 1ea9575c7c..465d606e2b 100644 --- a/gm/testimagefilters.cpp +++ b/gm/testimagefilters.cpp @@ -24,10 +24,8 @@ static SkImageFilter* make0() { return SkDownSampleImageFilter::Create(SK_Scalar1 / 5); } static SkImageFilter* make1() { return SkOffsetImageFilter::Create(SkIntToScalar(16), SkIntToScalar(16)); } static SkImageFilter* make2() { - SkColorFilter* cf = SkColorFilter::CreateModeFilter(SK_ColorBLUE, - SkXfermode::kSrcIn_Mode); - SkAutoUnref aur(cf); - return SkColorFilterImageFilter::Create(cf); + auto cf = SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode); + return SkColorFilterImageFilter::Create(cf.get()); } static SkImageFilter* make3() { return SkBlurImageFilter::Create(8, 0); @@ -56,10 +54,8 @@ static SkImageFilter* make6() { SkImageFilter* compose = SkComposeImageFilter::Create(outer, inner); SkAutoUnref aur2(compose); - SkColorFilter* cf = SkColorFilter::CreateModeFilter(0x880000FF, - SkXfermode::kSrcIn_Mode); - SkAutoUnref aur3(cf); - SkImageFilter* blue = SkColorFilterImageFilter::Create(cf); + auto cf = SkColorFilter::MakeModeFilter(0x880000FF, SkXfermode::kSrcIn_Mode); + SkImageFilter* blue = SkColorFilterImageFilter::Create(cf.get()); SkAutoUnref aur4(blue); return SkMergeImageFilter::Create(compose, blue); @@ -73,10 +69,8 @@ static SkImageFilter* make7() { SkImageFilter* compose = SkComposeImageFilter::Create(outer, inner); SkAutoUnref aur2(compose); - SkColorFilter* cf = SkColorFilter::CreateModeFilter(0x880000FF, - SkXfermode::kSrcIn_Mode); - SkAutoUnref aur3(cf); - SkImageFilter* blue = SkColorFilterImageFilter::Create(cf); + auto cf = SkColorFilter::MakeModeFilter(0x880000FF, SkXfermode::kSrcIn_Mode); + SkImageFilter* blue = SkColorFilterImageFilter::Create(cf.get()); SkAutoUnref aur4(blue); return SkMergeImageFilter::Create(compose, blue); |