diff options
| author |  mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-24 14:38:46 +0000 |
|---|---|---|
| committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-24 14:38:46 +0000 |
| commit | 61490fa4d20f44e049d8252a9e11d80626b608d2 (patch) | |
| tree | 6ed7852eae081855cf0f9eed60f751721fa77945 /samplecode/SampleAll.cpp | |
| parent | f6100c8b1aba89027cf74da8a324a744fd1d53fa (diff) | |
fix warnings related to constness in overrides of SkColorFilter
update samples for circle testing
git-svn-id: http://skia.googlecode.com/svn/trunk@6943 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleAll.cpp')
| -rw-r--r-- | samplecode/SampleAll.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index acdb148abe..662d561033 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -51,7 +51,8 @@ static inline SkPMColor rgb2gray(SkPMColor c) { class SkGrayScaleColorFilter : public SkColorFilter { public: - virtual void filterSpan(const SkPMColor src[], int count, SkPMColor result[]) { + virtual void filterSpan(const SkPMColor src[], int count, + SkPMColor result[]) const SK_OVERRIDE { for (int i = 0; i < count; i++) result[i] = rgb2gray(src[i]); } @@ -63,7 +64,8 @@ public: fMask = SkPackARGB32(0xFF, redMask, greenMask, blueMask); } - virtual void filterSpan(const SkPMColor src[], int count, SkPMColor result[]) { + virtual void filterSpan(const SkPMColor src[], int count, + SkPMColor result[]) const SK_OVERRIDE { SkPMColor mask = fMask; for (int i = 0; i < count; i++) { result[i] = src[i] & mask; @@ -163,7 +165,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect) protected: - virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) { + virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE { dst->addCircle(loc.fX, loc.fY, fRadius); } |