diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:00:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:00:56 +0000 |
| commit | 582bdf9a5961a32de27556832e23e0611c4d1cbb (patch) | |
| tree | ec33c632f8b6f6d0437342c4dfe211ae6e6f1ed3 /libs/hwui | |
| parent | c51fdd1bbf507862c10686458d2486f57a5b9585 (diff) | |
| parent | d8c169fedf883491e46b354484909694fd52cfaf (diff) | |
| download | frameworks_base-582bdf9a5961a32de27556832e23e0611c4d1cbb.zip frameworks_base-582bdf9a5961a32de27556832e23e0611c4d1cbb.tar.gz frameworks_base-582bdf9a5961a32de27556832e23e0611c4d1cbb.tar.bz2 | |
am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
Add appropriate casts for char16_t.
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/TextDropShadowCache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/TextDropShadowCache.cpp b/libs/hwui/TextDropShadowCache.cpp index 4eec462..96c09e6 100644 --- a/libs/hwui/TextDropShadowCache.cpp +++ b/libs/hwui/TextDropShadowCache.cpp @@ -40,7 +40,8 @@ hash_t ShadowText::hash() const { hash = JenkinsHashMix(hash, android::hash_type(italicStyle)); hash = JenkinsHashMix(hash, android::hash_type(scaleX)); if (text) { - hash = JenkinsHashMixShorts(hash, text, charCount); + hash = JenkinsHashMixShorts( + hash, reinterpret_cast<const uint16_t*>(text), charCount); } if (positions) { for (uint32_t i = 0; i < charCount * 2; i++) { |