diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-28 16:02:42 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-28 16:02:42 +0000 |
| commit | 1bfe01d06b896eca94c80d9af9a6bb30216b5e42 (patch) | |
| tree | 0e256137f26992e498744aa58a10f6d7a99a3198 /src | |
| parent | 9c72827f90759b37e11da6df6126bc484b5b5d91 (diff) | |
When creating gray from lcd, use luminance instead of coverage.
https://codereview.appspot.com/6496048/
git-svn-id: http://skia.googlecode.com/svn/trunk@5318 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/ports/SkFontHost_mac_coretext.cpp | 3 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_win.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp index 52ac1cf61b..d6a2543788 100644 --- a/src/ports/SkFontHost_mac_coretext.cpp +++ b/src/ports/SkFontHost_mac_coretext.cpp @@ -19,6 +19,7 @@ #include "SkFontHost.h" #include "SkCGUtils.h" +#include "SkColorPriv.h" #include "SkDescriptor.h" #include "SkEndian.h" #include "SkFontDescriptor.h" @@ -1123,7 +1124,7 @@ static inline uint8_t rgb_to_a8(CGRGBPixel rgb, const uint8_t* table8) { U8CPU r = (rgb >> 16) & 0xFF; U8CPU g = (rgb >> 8) & 0xFF; U8CPU b = (rgb >> 0) & 0xFF; - return sk_apply_lut_if<APPLY_PREBLEND>((r + g + b) / 3, table8); + return sk_apply_lut_if<APPLY_PREBLEND>(SkComputeLuminance(r, g, b), table8); } template<bool APPLY_PREBLEND> static void rgb_to_a8(const CGRGBPixel* SK_RESTRICT cgPixels, size_t cgRowBytes, diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index b9f1cdc7e7..46a89cc4cd 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -8,6 +8,7 @@ #include "SkAdvancedTypefaceMetrics.h" #include "SkBase64.h" +#include "SkColorPriv.h" #include "SkData.h" #include "SkDescriptor.h" #include "SkFontDescriptor.h" @@ -961,7 +962,7 @@ static inline uint8_t rgb_to_a8(SkGdiRGB rgb, const uint8_t* table8) { U8CPU r = (rgb >> 16) & 0xFF; U8CPU g = (rgb >> 8) & 0xFF; U8CPU b = (rgb >> 0) & 0xFF; - return sk_apply_lut_if<APPLY_PREBLEND>((r + g + b) / 3, table8); + return sk_apply_lut_if<APPLY_PREBLEND>(SkComputeLuminance(r, g, b), table8); } template<bool APPLY_PREBLEND> |