diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-15 14:10:42 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-15 14:10:42 +0000 |
| commit | 178964b6f6957762f00b0cfa12734f980fd97ca9 (patch) | |
| tree | c64acabffc60f9162d6bd98a2b057e2be3dd6daf /include | |
| parent | 2109923520e29ca2656da860eef6ea373781fd89 (diff) | |
Misc small fixes to unblock skia roll.
git-svn-id: http://skia.googlecode.com/svn/trunk@3196 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkColorPriv.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h index a9836fd86c..e51b0b9035 100644 --- a/include/core/SkColorPriv.h +++ b/include/core/SkColorPriv.h @@ -728,8 +728,8 @@ static inline int SkBlend32(int src, int dst, int scale) { return dst + ((src - dst) * scale >> 5); } -static SkPMColor SkBlendLCD16(int srcA, int srcR, int srcG, int srcB, - SkPMColor dst, uint16_t mask) { +static inline SkPMColor SkBlendLCD16(int srcA, int srcR, int srcG, int srcB, + SkPMColor dst, uint16_t mask) { if (mask == 0) { return dst; } @@ -763,9 +763,9 @@ static SkPMColor SkBlendLCD16(int srcA, int srcR, int srcG, int srcB, SkBlend32(srcB, dstB, maskB)); } -static SkPMColor SkBlendLCD16Opaque(int srcR, int srcG, int srcB, - SkPMColor dst, uint16_t mask, - SkPMColor opaqueDst) { +static inline SkPMColor SkBlendLCD16Opaque(int srcR, int srcG, int srcB, + SkPMColor dst, uint16_t mask, + SkPMColor opaqueDst) { if (mask == 0) { return dst; } @@ -798,8 +798,8 @@ static SkPMColor SkBlendLCD16Opaque(int srcR, int srcG, int srcB, SkBlend32(srcB, dstB, maskB)); } -static void SkBlitLCD16Row(SkPMColor dst[], const uint16_t src[], - SkColor color, int width, SkPMColor) { +static inline void SkBlitLCD16Row(SkPMColor dst[], const uint16_t src[], + SkColor color, int width, SkPMColor) { int srcA = SkColorGetA(color); int srcR = SkColorGetR(color); int srcG = SkColorGetG(color); @@ -812,9 +812,9 @@ static void SkBlitLCD16Row(SkPMColor dst[], const uint16_t src[], } } -static void SkBlitLCD16OpaqueRow(SkPMColor dst[], const uint16_t src[], - SkColor color, int width, - SkPMColor opaqueDst) { +static inline void SkBlitLCD16OpaqueRow(SkPMColor dst[], const uint16_t src[], + SkColor color, int width, + SkPMColor opaqueDst) { int srcR = SkColorGetR(color); int srcG = SkColorGetG(color); int srcB = SkColorGetB(color); |