| Index: include/effects/SkMorphologyImageFilter.h
|
| diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
|
| index c927f22e724f937623772382a791a69c1da21824..8d17609e5fda3d96c42b5bf11ac046ec0e4e7b98 100644
|
| --- a/include/effects/SkMorphologyImageFilter.h
|
| +++ b/include/effects/SkMorphologyImageFilter.h
|
| @@ -13,7 +13,7 @@
|
| #include "SkImageFilter.h"
|
| #include "SkSize.h"
|
|
|
| -class SkMorphologyImageFilter : public SkImageFilter {
|
| +class SK_API SkMorphologyImageFilter : public SkImageFilter {
|
| public:
|
| void computeFastBounds(const SkRect& src, SkRect* dst) const override;
|
| bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const override;
|
| @@ -51,8 +51,9 @@
|
|
|
| class SK_API SkDilateImageFilter : public SkMorphologyImageFilter {
|
| public:
|
| - static SkImageFilter* Create(int radiusX, int radiusY, SkImageFilter* input = NULL,
|
| - const CropRect* cropRect = NULL) {
|
| + static SkDilateImageFilter* Create(int radiusX, int radiusY,
|
| + SkImageFilter* input = NULL,
|
| + const CropRect* cropRect = NULL) {
|
| if (radiusX < 0 || radiusY < 0) {
|
| return NULL;
|
| }
|
| @@ -61,7 +62,6 @@
|
|
|
| bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* offset) const override;
|
| -
|
| #if SK_SUPPORT_GPU
|
| bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* offset) const override;
|
| @@ -70,16 +70,16 @@
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter)
|
|
|
| -private:
|
| +protected:
|
| SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
|
| : INHERITED(radiusX, radiusY, input, cropRect) {}
|
| -
|
| +private:
|
| typedef SkMorphologyImageFilter INHERITED;
|
| };
|
|
|
| class SK_API SkErodeImageFilter : public SkMorphologyImageFilter {
|
| public:
|
| - static SkImageFilter* Create(int radiusX, int radiusY,
|
| + static SkErodeImageFilter* Create(int radiusX, int radiusY,
|
| SkImageFilter* input = NULL,
|
| const CropRect* cropRect = NULL) {
|
| if (radiusX < 0 || radiusY < 0) {
|
| @@ -90,7 +90,6 @@
|
|
|
| bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* offset) const override;
|
| -
|
| #if SK_SUPPORT_GPU
|
| bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* offset) const override;
|
| @@ -99,10 +98,11 @@
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter)
|
|
|
| -private:
|
| +protected:
|
| SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
|
| : INHERITED(radiusX, radiusY, input, cropRect) {}
|
|
|
| +private:
|
| typedef SkMorphologyImageFilter INHERITED;
|
| };
|
|
|
|
|