diff options
Diffstat (limited to 'src/effects')
-rw-r--r-- | src/effects/SkEmbossMaskFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkShaderMaskFilter.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp index e991d94985..4a4c8d0e34 100644 --- a/src/effects/SkEmbossMaskFilter.cpp +++ b/src/effects/SkEmbossMaskFilter.cpp @@ -72,6 +72,10 @@ SkMask::Format SkEmbossMaskFilter::getFormat() const { bool SkEmbossMaskFilter::filterMask(SkMask* dst, const SkMask& src, const SkMatrix& matrix, SkIPoint* margin) const { + if (src.fFormat != SkMask::kA8_Format) { + return false; + } + SkScalar sigma = matrix.mapRadius(fBlurSigma); if (!SkBlurMask::BoxBlur(dst, src, sigma, kInner_SkBlurStyle)) { diff --git a/src/effects/SkShaderMaskFilter.cpp b/src/effects/SkShaderMaskFilter.cpp index 83159941a1..cfa15c5bad 100644 --- a/src/effects/SkShaderMaskFilter.cpp +++ b/src/effects/SkShaderMaskFilter.cpp @@ -70,7 +70,9 @@ static void rect_memcpy(void* dst, size_t dstRB, const void* src, size_t srcRB, bool SkShaderMF::filterMask(SkMask* dst, const SkMask& src, const SkMatrix& ctm, SkIPoint* margin) const { - SkASSERT(src.fFormat == SkMask::kA8_Format); + if (src.fFormat != SkMask::kA8_Format) { + return false; + } if (margin) { margin->set(0, 0); |