aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/SkMergeImageFilter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/effects/SkMergeImageFilter.cpp')
-rwxr-xr-xsrc/effects/SkMergeImageFilter.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
index 47d33dffb4..07b2c1cf3e 100755
--- a/src/effects/SkMergeImageFilter.cpp
+++ b/src/effects/SkMergeImageFilter.cpp
@@ -42,10 +42,10 @@ void SkMergeImageFilter::initModes(const SkXfermode::Mode modes[]) {
}
}
-SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count,
+SkMergeImageFilter::SkMergeImageFilter(sk_sp<SkImageFilter> filters[], int count,
const SkXfermode::Mode modes[],
const CropRect* cropRect)
- : INHERITED(count, filters, cropRect) {
+ : INHERITED(filters, count, cropRect) {
SkASSERT(count >= 0);
this->initModes(modes);
}
@@ -149,9 +149,9 @@ SkFlattenable* SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) {
if (!buffer.isValid()) {
return nullptr;
}
- return Create(common.inputs(), count, modes.get(), &common.cropRect());
+ return Make(common.inputs(), count, modes.get(), &common.cropRect()).release();
}
- return Create(common.inputs(), count, nullptr, &common.cropRect());
+ return Make(common.inputs(), count, nullptr, &common.cropRect()).release();
}
void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const {