From 7096dc6b27892e157403e0631b2f284d95529626 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 11 May 2012 18:01:50 +0000 Subject: [PATCH] fix SK_RESTRICT warnings related to overrides on windows git-svn-id: http://skia.googlecode.com/svn/trunk@3913 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/SkGradientShader.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index 8b78984d78..6de820bef8 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -1370,10 +1370,12 @@ public: 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, + virtual void shadeSpan16(int x, int y, uint16_t* dstCParam, int count) SK_OVERRIDE { SkASSERT(count > 0); + uint16_t* SK_RESTRICT dstC = dstCParam; + SkPoint srcPt; SkMatrix::MapXYProc dstProc = fDstToIndexProc; TileProc proc = fTileProc; @@ -1902,10 +1904,12 @@ public: return kRadial2_GradientType; } - virtual void shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, + virtual void shadeSpan(int x, int y, SkPMColor* dstCParam, int count) SK_OVERRIDE { SkASSERT(count > 0); + SkPMColor* SK_RESTRICT dstC = dstCParam; + // Zero difference between radii: fill with transparent black. if (fDiffRadius == 0) { sk_bzero(dstC, count * sizeof(*dstC));