diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:19:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:19:06 +0000 |
| commit | 47249598cbada478d7e0b8dca200599c50ea6e69 (patch) | |
| tree | f08e3368758a55e7be6401e54f7a3943b15e893b /libs/hwui | |
| parent | 87f08193273c7e5c6615ea3afd2c947caae22ef0 (diff) | |
| parent | 582bdf9a5961a32de27556832e23e0611c4d1cbb (diff) | |
| download | frameworks_base-47249598cbada478d7e0b8dca200599c50ea6e69.zip frameworks_base-47249598cbada478d7e0b8dca200599c50ea6e69.tar.gz frameworks_base-47249598cbada478d7e0b8dca200599c50ea6e69.tar.bz2 | |
am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
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 9e02a30..a642c68 100644 --- a/libs/hwui/TextDropShadowCache.cpp +++ b/libs/hwui/TextDropShadowCache.cpp @@ -41,7 +41,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++) { |