diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-07 15:30:34 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-07 15:30:34 +0000 |
commit | 8e6d914b87a882ebf6ffe8f4be53b86ffec5cf62 (patch) | |
tree | 8276c0bf3d1c1531e5640d26da1d9ea1ed378b5f /src/effects/SkGradientShader.cpp | |
parent | 7716afbb9709da30f98a18bfe95f03574795f4a0 (diff) |
fix win compile: sure wish SK_OVERRIDE was testable on mac build
git-svn-id: http://skia.googlecode.com/svn/trunk@2821 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkGradientShader.cpp')
-rw-r--r-- | src/effects/SkGradientShader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index ded16e71ba..bc7f8a3a68 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -1151,7 +1151,7 @@ public: rad_to_unit_matrix(center, radius, &fPtsToUnit); } - virtual void shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, int count) SK_OVERRIDE; + virtual void shadeSpan(int x, int y, SkPMColor* dstC, int count) SK_OVERRIDE; virtual void shadeSpan16(int x, int y, uint16_t* SK_RESTRICT dstC, int count) SK_OVERRIDE { SkASSERT(count > 0); @@ -1279,7 +1279,7 @@ public: return kRadial_GradientType; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) SK_OVERRIDE { + static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(Radial_Gradient, (buffer)); } @@ -1618,7 +1618,7 @@ public: return kTwoPointRadial_BitmapType; } - virtual GradientType asAGradient(GradientInfo* info) const { + virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { if (info) { commonAsAGradient(info); info->fPoint[0] = fCenter1; @@ -1629,7 +1629,7 @@ public: return kRadial2_GradientType; } - virtual void shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, int count) { + virtual void shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, int count) SK_OVERRIDE { SkASSERT(count > 0); // Zero difference between radii: fill with transparent black. @@ -1717,8 +1717,8 @@ public: virtual bool setContext(const SkBitmap& device, const SkPaint& paint, - const SkMatrix& matrix) { - if (!this->INHERITED::setContext(device, paint, matrix)) SK_OVERRIDE { + const SkMatrix& matrix) SK_OVERRIDE { + if (!this->INHERITED::setContext(device, paint, matrix)) { return false; } @@ -1727,7 +1727,7 @@ public: return true; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) SK_OVERRIDE { + static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(Two_Point_Radial_Gradient, (buffer)); } @@ -1816,7 +1816,7 @@ public: return kSweep_GradientType; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) SK_OVERRIDE { + static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(Sweep_Gradient, (buffer)); } |