diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-14 20:30:14 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-14 20:30:14 +0000 |
| commit | cd9d69b9ce7eb301a9fd8d91b9f95fd99b07bae5 (patch) | |
| tree | 699c584b39fd1e30022bb05ce58dad15fcd9b4c7 /include/effects/SkPorterDuff.h | |
| parent | 260db92d4975c50fd929399e8d6875a4c854cd5d (diff) | |
Upstreaming changes from android.
- fix compile warnings in the GPU code
- upstream android specific code (ifdef protected)
- fail gracefully when a custom allocator fails
git-svn-id: http://skia.googlecode.com/svn/trunk@936 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/SkPorterDuff.h')
| -rw-r--r-- | include/effects/SkPorterDuff.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/effects/SkPorterDuff.h b/include/effects/SkPorterDuff.h index 6f4ac20be3..54f81ea175 100644 --- a/include/effects/SkPorterDuff.h +++ b/include/effects/SkPorterDuff.h @@ -52,6 +52,9 @@ public: kMultiply_Mode, //!< [Sa * Da, Sc * Dc] kScreen_Mode, //!< [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] kAdd_Mode, //!< Saturate(S + D) +#ifdef ANDROID + kOverlay_Mode, +#endif kModeCount }; |