diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-10 20:54:07 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-10 21:29:52 -0800 |
commit | edaecc1db0584fa017822dfc2da0c968b53967e6 (patch) | |
tree | dc2db79f490bc2e334c6e3688e099c98e846f381 /libs/hwui/font/Font.cpp | |
parent | baa73b056cbd4627a84b39a6267065ae56677220 (diff) | |
download | frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.zip frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.tar.gz frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.tar.bz2 |
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
Diffstat (limited to 'libs/hwui/font/Font.cpp')
-rw-r--r-- | libs/hwui/font/Font.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index e1df9ba..29c122b 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -378,7 +378,7 @@ void Font::precache(const SkPaint* paint, const char* text, int numGlyphs) { break; } - CachedGlyphInfo* cachedGlyph = getCachedGlyph(paint, glyph, true); + getCachedGlyph(paint, glyph, true); glyphsCount++; } } @@ -403,8 +403,6 @@ void Font::render(const SkPaint* paint, const char* text, uint32_t start, uint32 text += start; int glyphsCount = 0; - const SkPaint::Align align = paint->getTextAlign(); - while (glyphsCount < numGlyphs) { glyph_t glyph = GET_GLYPH(text); |