diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 22:25:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 22:25:07 +0000 |
| commit | d8c169fedf883491e46b354484909694fd52cfaf (patch) | |
| tree | acdec1eddce5fb5c55ab7ee791a54444456bde4d /libs/hwui/TextDropShadowCache.cpp | |
| parent | bcb86374dccf15a8ee1dc03a1c69638fc6d9529f (diff) | |
| parent | 0c437fd3a79ba5f9118ec10940a3398665690587 (diff) | |
am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit '0c437fd3a79ba5f9118ec10940a3398665690587':
Add appropriate casts for char16_t.
Diffstat (limited to 'libs/hwui/TextDropShadowCache.cpp')
| -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 4eec4628323e..96c09e645196 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++) { |