diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 16:50:27 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 16:50:27 +0000 |
| commit | a87cd2af4c7f46ba8437c2e500805c9deb9e3a40 (patch) | |
| tree | 3575a755aadb578f677d83a995bc6a2a74fe8bf6 /src/effects/SkColorMatrixFilter.cpp | |
| parent | 2c8208f3a444098aee562f5a1ef620142807eda2 (diff) | |
Increase compatibility with clang, mostly around SK_RESTRICT.
Attempting to fix up our use of __restrict__ so Chrome can enable it.
git-svn-id: http://skia.googlecode.com/svn/trunk@1597 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkColorMatrixFilter.cpp')
| -rw-r--r-- | src/effects/SkColorMatrixFilter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 9270052544..d5d1d31883 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -110,7 +110,9 @@ static void Add16(SkColorMatrixFilter::State* state, #define kNO_ALPHA_FLAGS (SkColorFilter::kAlphaUnchanged_Flag | \ SkColorFilter::kHasFilter16_Flag) -void SkColorMatrixFilter::setup(const SkScalar SK_RESTRICT src[20]) { +// src is [20] but some compilers won't accept __restrict__ on anything +// but an raw pointer or reference +void SkColorMatrixFilter::setup(const SkScalar* SK_RESTRICT src) { if (NULL == src) { fProc = NULL; // signals identity fFlags = kNO_ALPHA_FLAGS; |