summaryrefslogtreecommitdiff
path: root/libs/hwui/TextDropShadowCache.cpp
diff options
context:
space:
mode:
author Dan Albert <danalbert@google.com> 2014-11-20 22:19:38 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-11-20 22:19:38 +0000
commit0c437fd3a79ba5f9118ec10940a3398665690587 (patch)
treed0fbe0b7e852e84f82d0c29e01c1c8c9efd7ca6e /libs/hwui/TextDropShadowCache.cpp
parent9f285bd60b219b562bc55c7c2a9fae23eae554e5 (diff)
parent6698749dd4d4d6513b26aa9071af290b956b68a7 (diff)
Merge "Add appropriate casts for char16_t."
Diffstat (limited to 'libs/hwui/TextDropShadowCache.cpp')
-rw-r--r--libs/hwui/TextDropShadowCache.cpp3
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++) {