diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 11:41:21 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-20 11:47:40 -0800 |
| commit | 6698749dd4d4d6513b26aa9071af290b956b68a7 (patch) | |
| tree | 6c0716e521b60ff501f4aa4a3f7aff160578135f /libs/hwui/TextDropShadowCache.cpp | |
| parent | 36c7f4b67326bad547f16aa6e72140bd839ab28d (diff) | |
| download | frameworks_base-6698749dd4d4d6513b26aa9071af290b956b68a7.zip frameworks_base-6698749dd4d4d6513b26aa9071af290b956b68a7.tar.gz frameworks_base-6698749dd4d4d6513b26aa9071af290b956b68a7.tar.bz2 | |
Add appropriate casts for char16_t.
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.
Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
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 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++) { |