aboutsummaryrefslogtreecommitdiffhomepage
path: root/fuzz
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-04-08 08:01:20 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-08 08:01:20 -0700
commitef6a47b4af1ebf621682b3398916fefb90fc912e (patch)
treee9ddad02013f8a95a993b5ad8ef53cab16e65329 /fuzz
parent2bb3b6d2bb2cb3cc72ba254b34fadde5319c141a (diff)
Update MatrixConvolutionImageFilter to sk_sp
Diffstat (limited to 'fuzz')
-rw-r--r--fuzz/FilterFuzz.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp
index ebb9de85c2..1cd20c034e 100644
--- a/fuzz/FilterFuzz.cpp
+++ b/fuzz/FilterFuzz.cpp
@@ -552,7 +552,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(),
@@ -611,18 +611,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: