| Index: samplecode/SampleFilterFuzz.cpp
|
| diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
|
| index a7f4163b27fa9fd4ed1a0346ec82d7afd1154859..f09c6a57a015c4f217f5991a768a72fbe81a5693 100644
|
| --- a/samplecode/SampleFilterFuzz.cpp
|
| +++ b/samplecode/SampleFilterFuzz.cpp
|
| @@ -555,7 +555,7 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) {
|
| filter = SkAlphaThresholdFilter::Make(make_region(),
|
| make_scalar(),
|
| make_scalar(),
|
| - nullptr);
|
| + make_image_filter());
|
| break;
|
| case MERGE:
|
| filter = SkMergeImageFilter::Make(make_image_filter(),
|
| @@ -614,18 +614,16 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) {
|
| }
|
| SkIPoint kernelOffset = SkIPoint::Make(R(SkIntToScalar(size.width())),
|
| R(SkIntToScalar(size.height())));
|
| - sk_sp<SkImageFilter> subFilter(make_image_filter());
|
|
|
| - filter = sk_sp<SkImageFilter>(SkMatrixConvolutionImageFilter::Create(
|
| - size,
|
| - kernel.begin(),
|
| - make_scalar(),
|
| - make_scalar(),
|
| - kernelOffset,
|
| - (SkMatrixConvolutionImageFilter::TileMode)R(3),
|
| - R(2) == 1,
|
| - subFilter.get(),
|
| - &cropR));
|
| + filter = SkMatrixConvolutionImageFilter::Make(size,
|
| + kernel.begin(),
|
| + make_scalar(),
|
| + make_scalar(),
|
| + kernelOffset,
|
| + (SkMatrixConvolutionImageFilter::TileMode)R(3),
|
| + R(2) == 1,
|
| + make_image_filter(),
|
| + &cropR);
|
| break;
|
| }
|
| case COMPOSE:
|
|
|