diff options
| author | Raph Levien <raph@google.com> | 2014-05-28 15:38:35 -0700 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2014-05-29 15:16:32 -0700 |
| commit | 066e8575af64fb452617ac6005de6ccf6509553b (patch) | |
| tree | 3a8187ce949110cb402cf4205eaa566cae88ce99 /include/minikin/FontCollection.h | |
| parent | 7b221d97b7b64dc5ce457e19666d55d042e22e62 (diff) | |
| download | android_frameworks_minikin-066e8575af64fb452617ac6005de6ccf6509553b.tar.gz android_frameworks_minikin-066e8575af64fb452617ac6005de6ccf6509553b.tar.bz2 android_frameworks_minikin-066e8575af64fb452617ac6005de6ccf6509553b.zip | |
Fix ZWJ not working for Indic fonts
This is a fix for bug 15185229 ZWJ not working in Sinhala and Kannada.
Indic fonts (unlike Arabic) require the entire string, including ZWJ,
to be passed to Harfbuzz; it's not enough for the ZWJ to be present in
the context. The solution is to be "sticky" in font itemization,
continuing to use the same font as long as it has Unicode coverage.
Change-Id: I7673bc56fbda09f1e1a4582e8d88342343b706f1
Diffstat (limited to 'include/minikin/FontCollection.h')
| -rw-r--r-- | include/minikin/FontCollection.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/minikin/FontCollection.h b/include/minikin/FontCollection.h index a350237..78ab2aa 100644 --- a/include/minikin/FontCollection.h +++ b/include/minikin/FontCollection.h @@ -32,8 +32,6 @@ public: ~FontCollection(); - const FontFamily* getFamilyForChar(uint32_t ch, FontLanguage lang, int variant) const; - class Run { public: // Do copy constructor, assignment, destructor so it can be used in vectors @@ -74,6 +72,8 @@ private: size_t end; }; + const FontInstance* getInstanceForChar(uint32_t ch, FontLanguage lang, int variant) const; + // static for allocating unique id's static uint32_t sNextId; |