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 /src/effects | |
| 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 'src/effects')
| -rw-r--r-- | src/effects/SkPorterDuff.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/effects/SkPorterDuff.cpp b/src/effects/SkPorterDuff.cpp index 58447add4e..980ce29d23 100644 --- a/src/effects/SkPorterDuff.cpp +++ b/src/effects/SkPorterDuff.cpp @@ -29,7 +29,10 @@ static const struct Pair { MAKE_PAIR(Lighten), MAKE_PAIR(Multiply), MAKE_PAIR(Screen), - { SkPorterDuff::kAdd_Mode, SkXfermode::kPlus_Mode } + { SkPorterDuff::kAdd_Mode, SkXfermode::kPlus_Mode }, +#ifdef ANDROID + MAKE_PAIR(Overlay), +#endif }; static bool find_pdmode(SkXfermode::Mode src, SkPorterDuff::Mode* dst) { |