diff options
author | Derek Sollenberger <djsollen@google.com> | 2012-03-06 09:06:43 -0500 |
---|---|---|
committer | Derek Sollenberger <derek@android.com> | 2012-03-06 09:44:47 -0500 |
commit | 4f1dae40e24d57d647db01443b8bf2410514b8b5 (patch) | |
tree | 594df3f3fc6c1d90a76691a75763ae1beacfdf98 /src/effects/SkAvoidXfermode.cpp | |
parent | 1cab2921ab279367f8206cdadc9259d12e603548 (diff) | |
download | external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.zip external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.tar.gz external_skia-4f1dae40e24d57d647db01443b8bf2410514b8b5.tar.bz2 |
Skia Merge (revision 3312)
This CL also includes changes made to Android's copy of
Skia in their J release branch.
Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc
Diffstat (limited to 'src/effects/SkAvoidXfermode.cpp')
-rw-r--r-- | src/effects/SkAvoidXfermode.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/effects/SkAvoidXfermode.cpp b/src/effects/SkAvoidXfermode.cpp index d2cd49b..9f4e396 100644 --- a/src/effects/SkAvoidXfermode.cpp +++ b/src/effects/SkAvoidXfermode.cpp @@ -98,16 +98,6 @@ static int scale_dist_14(int dist, uint32_t mul, uint32_t sub) return result; } -static SkPMColor SkFourByteInterp(SkPMColor src, SkPMColor dst, unsigned scale) -{ - unsigned a = SkAlphaBlend(SkGetPackedA32(src), SkGetPackedA32(dst), scale); - unsigned r = SkAlphaBlend(SkGetPackedR32(src), SkGetPackedR32(dst), scale); - unsigned g = SkAlphaBlend(SkGetPackedG32(src), SkGetPackedG32(dst), scale); - unsigned b = SkAlphaBlend(SkGetPackedB32(src), SkGetPackedB32(dst), scale); - - return SkPackARGB32(a, r, g, b); -} - static inline unsigned Accurate255To256(unsigned x) { return x + (x >> 7); } |