| Index: include/effects/SkMorphologyImageFilter.h
|
| diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
|
| index 75551b6d8a5bc4265ecf2cec9ec73c98f3408f6b..499d6a8c26bd3d04acb85d7043ff7d4446744b56 100644
|
| --- a/include/effects/SkMorphologyImageFilter.h
|
| +++ b/include/effects/SkMorphologyImageFilter.h
|
| @@ -34,7 +34,9 @@ protected:
|
| bool filterImageGeneric(Proc procX, Proc procY,
|
| Proxy*, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* offset) const;
|
| +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
| SkMorphologyImageFilter(SkReadBuffer& buffer);
|
| +#endif
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| #if SK_SUPPORT_GPU
|
| virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
|
| @@ -55,6 +57,9 @@ public:
|
| static SkDilateImageFilter* Create(int radiusX, int radiusY,
|
| SkImageFilter* input = NULL,
|
| const CropRect* cropRect = NULL) {
|
| + if (radiusX < 0 || radiusY < 0) {
|
| + return NULL;
|
| + }
|
| return SkNEW_ARGS(SkDilateImageFilter, (radiusX, radiusY, input, cropRect));
|
| }
|
|
|
| @@ -70,7 +75,9 @@ public:
|
| protected:
|
| SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
|
| : INHERITED(radiusX, radiusY, input, cropRect) {}
|
| +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
| explicit SkDilateImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
|
| +#endif
|
|
|
| private:
|
| typedef SkMorphologyImageFilter INHERITED;
|
| @@ -81,6 +88,9 @@ public:
|
| static SkErodeImageFilter* Create(int radiusX, int radiusY,
|
| SkImageFilter* input = NULL,
|
| const CropRect* cropRect = NULL) {
|
| + if (radiusX < 0 || radiusY < 0) {
|
| + return NULL;
|
| + }
|
| return SkNEW_ARGS(SkErodeImageFilter, (radiusX, radiusY, input, cropRect));
|
| }
|
|
|
| @@ -96,7 +106,9 @@ public:
|
| protected:
|
| SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
|
| : INHERITED(radiusX, radiusY, input, cropRect) {}
|
| +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
| explicit SkErodeImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
|
| +#endif
|
|
|
| private:
|
| typedef SkMorphologyImageFilter INHERITED;
|
|
|