diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-08 20:14:32 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-08 20:14:32 +0000 |
| commit | eefd8a01fc984e15ca108cb2951c52b3ea17d6b8 (patch) | |
| tree | 84a81c77c29ac19da9b976b93a7a936a8edff169 /src/core | |
| parent | 066a28d2c19c5d09a7a8f27543a8c171c5816cf5 (diff) | |
Don't try to render color fonts using distance fields.
Adds detection of ARGB mask format, which is only used for color fonts.
BUG=skia:2173
R=bungeman@google.com, reed@google.com, bsalomon@google.com, robertphillips@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/224903012
git-svn-id: http://skia.googlecode.com/svn/trunk@14098 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkScalerContext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h index 63b1f186f1..f18d217f62 100644 --- a/src/core/SkScalerContext.h +++ b/src/core/SkScalerContext.h @@ -192,8 +192,8 @@ public: SkFontID findTypefaceIdForChar(SkUnichar uni); #endif - static inline void MakeRec(const SkPaint&, const SkDeviceProperties* deviceProperties, - const SkMatrix*, Rec* rec); + static void MakeRec(const SkPaint&, const SkDeviceProperties* deviceProperties, + const SkMatrix*, Rec* rec); static inline void PostMakeRec(const SkPaint&, Rec*); static SkMaskGamma::PreBlend GetMaskPreBlend(const Rec& rec); |