| Index: src/core/SkBitmapFilter.h
|
| diff --git a/src/core/SkBitmapFilter.h b/src/core/SkBitmapFilter.h
|
| index 139e990a10e75d2e7b2f10babc659441eb2865ec..93b552efd7c80b9d90efc60fab7feb2714f43998 100644
|
| --- a/src/core/SkBitmapFilter.h
|
| +++ b/src/core/SkBitmapFilter.h
|
| @@ -79,7 +79,7 @@ class SkMitchellFilter: public SkBitmapFilter {
|
| : SkBitmapFilter(width), B(b), C(c) {
|
| }
|
|
|
| - float evaluate(float x) const SK_OVERRIDE {
|
| + float evaluate(float x) const override {
|
| x = fabsf(x);
|
| if (x > 2.f) {
|
| return 0;
|
| @@ -102,7 +102,7 @@ class SkGaussianFilter: public SkBitmapFilter {
|
| : SkBitmapFilter(width), alpha(a), expWidth(expf(-alpha * width * width)) {
|
| }
|
|
|
| - float evaluate(float x) const SK_OVERRIDE {
|
| + float evaluate(float x) const override {
|
| return SkTMax(0.f, float(expf(-alpha*x*x) - expWidth));
|
| }
|
| protected:
|
| @@ -115,7 +115,7 @@ class SkTriangleFilter: public SkBitmapFilter {
|
| : SkBitmapFilter(width) {
|
| }
|
|
|
| - float evaluate(float x) const SK_OVERRIDE {
|
| + float evaluate(float x) const override {
|
| return SkTMax(0.f, fWidth - fabsf(x));
|
| }
|
| protected:
|
| @@ -127,7 +127,7 @@ class SkBoxFilter: public SkBitmapFilter {
|
| : SkBitmapFilter(width) {
|
| }
|
|
|
| - float evaluate(float x) const SK_OVERRIDE {
|
| + float evaluate(float x) const override {
|
| return (x >= -fWidth && x < fWidth) ? 1.0f : 0.0f;
|
| }
|
| protected:
|
| @@ -138,7 +138,7 @@ public:
|
| SkHammingFilter(float width=1.f)
|
| : SkBitmapFilter(width) {
|
| }
|
| - float evaluate(float x) const SK_OVERRIDE {
|
| + float evaluate(float x) const override {
|
| if (x <= -fWidth || x >= fWidth) {
|
| return 0.0f; // Outside of the window.
|
| }
|
| @@ -158,7 +158,7 @@ class SkLanczosFilter: public SkBitmapFilter {
|
| : SkBitmapFilter(width) {
|
| }
|
|
|
| - float evaluate(float x) const SK_OVERRIDE {
|
| + float evaluate(float x) const override {
|
| if (x <= -fWidth || x >= fWidth) {
|
| return 0.0f; // Outside of the window.
|
| }
|
|
|