diff options
| author | Seigo Nonaka <nona@google.com> | 2015-10-20 03:47:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-20 03:47:03 +0000 |
| commit | 16da66db748ce4877bc1d3e7af783eed8a08c77a (patch) | |
| tree | aa28b910985b4e9108a5bbadfb0c6bd25f98f11d /include/minikin | |
| parent | 82ceb82fe1ab0e43e70881c2a4b8ff77ec38f80a (diff) | |
| parent | bbdd73ec077a1bb6801b25a639834be16dfd78cb (diff) | |
| download | android_frameworks_minikin-16da66db748ce4877bc1d3e7af783eed8a08c77a.tar.gz android_frameworks_minikin-16da66db748ce4877bc1d3e7af783eed8a08c77a.tar.bz2 android_frameworks_minikin-16da66db748ce4877bc1d3e7af783eed8a08c77a.zip | |
Merge "Support Variation Selector in font selection."
Diffstat (limited to 'include/minikin')
| -rw-r--r-- | include/minikin/FontCollection.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/minikin/FontCollection.h b/include/minikin/FontCollection.h index c4daf98..ca24e38 100644 --- a/include/minikin/FontCollection.h +++ b/include/minikin/FontCollection.h @@ -60,7 +60,7 @@ private: size_t end; }; - FontFamily* getFamilyForChar(uint32_t ch, FontLanguage lang, int variant) const; + FontFamily* getFamilyForChar(uint32_t ch, uint32_t vs, FontLanguage lang, int variant) const; // static for allocating unique id's static uint32_t sNextId; |