Index: src/effects/SkMorphologyImageFilter.cpp |
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp |
index 351042bd83316b2e244dfcf9fd7ee70dd1fe28a5..a8f9da4f4796278625de8323aae5c038002ba927 100644 |
--- a/src/effects/SkMorphologyImageFilter.cpp |
+++ b/src/effects/SkMorphologyImageFilter.cpp |
@@ -18,7 +18,6 @@ |
#include "GrTBackendEffectFactory.h" |
#include "gl/GrGLEffect.h" |
#include "effects/Gr1DKernelEffect.h" |
-#include "SkImageFilterUtils.h" |
#endif |
SkMorphologyImageFilter::SkMorphologyImageFilter(SkReadBuffer& buffer) |
@@ -530,7 +529,8 @@ bool apply_morphology(const SkBitmap& input, |
morphType, Gr1DKernelEffect::kY_Direction); |
src.reset(ast.detach()); |
} |
- return SkImageFilterUtils::WrapTexture(src, rect.width(), rect.height(), dst); |
+ SkImageFilter::WrapTexture(src, rect.width(), rect.height(), dst); |
+ return true; |
} |
}; |
@@ -541,9 +541,9 @@ bool SkMorphologyImageFilter::filterImageGPUGeneric(bool dilate, |
const SkMatrix& ctm, |
SkBitmap* result, |
SkIPoint* offset) const { |
- SkBitmap input; |
+ SkBitmap input = src; |
SkIPoint srcOffset = SkIPoint::Make(0, 0); |
- if (!SkImageFilterUtils::GetInputResultGPU(getInput(0), proxy, src, ctm, &input, &srcOffset)) { |
+ if (getInput(0) && !getInput(0)->getInputResultGPU(proxy, src, ctm, &input, &srcOffset)) { |
return false; |
} |
SkIRect bounds; |