diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-09 04:30:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-09 04:30:35 +0000 |
| commit | 2ffa4aabd76353a907ee89a3e0c6f1961237f257 (patch) | |
| tree | 155ccc475b02ef260666cc118fcfd8fc3a2474f7 /core/jni/android/graphics/TextLayoutCache.cpp | |
| parent | 5a6934c07946743e622df52ba1155d97129b37f0 (diff) | |
| parent | f348c15ecf78e9d58b8238ffcf1d78a279e3a862 (diff) | |
| download | frameworks_base-2ffa4aabd76353a907ee89a3e0c6f1961237f257.zip frameworks_base-2ffa4aabd76353a907ee89a3e0c6f1961237f257.tar.gz frameworks_base-2ffa4aabd76353a907ee89a3e0c6f1961237f257.tar.bz2 | |
Merge "Use char16_t for char things."
Diffstat (limited to 'core/jni/android/graphics/TextLayoutCache.cpp')
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 5db083a..d37bc32 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -499,7 +499,7 @@ void TextLayoutShaper::computeValues(const SkPaint* paint, const UChar* chars, #define HB_InvalidCodePoint ~0u hb_codepoint_t -utf16_to_code_point(const uint16_t *chars, size_t len, ssize_t *iter) { +utf16_to_code_point(const char16_t *chars, size_t len, ssize_t *iter) { const uint16_t v = chars[(*iter)++]; if (HB_IsHighSurrogate(v)) { // surrogate pair @@ -526,7 +526,7 @@ utf16_to_code_point(const uint16_t *chars, size_t len, ssize_t *iter) { } hb_codepoint_t -utf16_to_code_point_prev(const uint16_t *chars, size_t len, ssize_t *iter) { +utf16_to_code_point_prev(const char16_t *chars, size_t len, ssize_t *iter) { const uint16_t v = chars[(*iter)--]; if (HB_IsLowSurrogate(v)) { // surrogate pair @@ -567,7 +567,7 @@ hb_script_t code_point_to_script(hb_codepoint_t codepoint) { } bool -hb_utf16_script_run_next(ScriptRun* run, const uint16_t *chars, size_t len, ssize_t *iter) { +hb_utf16_script_run_next(ScriptRun* run, const char16_t *chars, size_t len, ssize_t *iter) { if (size_t(*iter) == len) return false; @@ -610,7 +610,7 @@ hb_utf16_script_run_next(ScriptRun* run, const uint16_t *chars, size_t len, ssiz } bool -hb_utf16_script_run_prev(ScriptRun* run, const uint16_t *chars, size_t len, ssize_t *iter) { +hb_utf16_script_run_prev(ScriptRun* run, const char16_t *chars, size_t len, ssize_t *iter) { if (*iter == -1) return false; |