diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-30 21:36:11 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-30 21:36:11 +0000 |
| commit | 8d3cd7a170c810e3816bf00220cbef51e7b16795 (patch) | |
| tree | 6a76204c1d68934976e1542fc05e82d5a130a6b0 /include/effects | |
| parent | 118c1a70c7e8f9733d406cf69de9a5970b3ceb01 (diff) | |
Review URL: https://codereview.appspot.com/7232062
git-svn-id: http://skia.googlecode.com/svn/trunk@7476 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects')
| -rw-r--r-- | include/effects/SkBlendImageFilter.h | 2 | ||||
| -rw-r--r-- | include/effects/SkPorterDuff.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/effects/SkBlendImageFilter.h b/include/effects/SkBlendImageFilter.h index a2dc847494..6b01963fd0 100644 --- a/include/effects/SkBlendImageFilter.h +++ b/include/effects/SkBlendImageFilter.h @@ -15,7 +15,7 @@ class SK_API SkBlendImageFilter : public SkImageFilter { public: enum Mode { kNormal_Mode, - kMultiply_Mode, + kModulate_Mode, // TODO: replace this with the (soon to be) SkXfermode version of kMultiply_Mode kScreen_Mode, kDarken_Mode, kLighten_Mode, diff --git a/include/effects/SkPorterDuff.h b/include/effects/SkPorterDuff.h index 1bba171bc4..c5f549211d 100644 --- a/include/effects/SkPorterDuff.h +++ b/include/effects/SkPorterDuff.h @@ -40,7 +40,7 @@ public: kXor_Mode, //!< [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc] kDarken_Mode, //!< [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + min(Sc, Dc)] kLighten_Mode, //!< [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + max(Sc, Dc)] - kMultiply_Mode, //!< [Sa * Da, Sc * Dc] + kModulate_Mode, //!< [Sa * Da, Sc * Dc] multiplies all components kScreen_Mode, //!< [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] kAdd_Mode, //!< Saturate(S + D) #ifdef SK_BUILD_FOR_ANDROID |