summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsFont.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-11-15 11:11:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-15 11:11:22 -0800
commitb763fa1d7c7de7ee33ab359e3105accafe5a2fdc (patch)
tree21734ae6662baa9e3b093ba70da6131038b375c6 /libs/rs/rsFont.cpp
parentee4a7d86823605e98711d46adb9b7ed302f82346 (diff)
parent300ba6846949f5b21c6d93d7698dbc39716cf832 (diff)
downloadframeworks_base-b763fa1d7c7de7ee33ab359e3105accafe5a2fdc.zip
frameworks_base-b763fa1d7c7de7ee33ab359e3105accafe5a2fdc.tar.gz
frameworks_base-b763fa1d7c7de7ee33ab359e3105accafe5a2fdc.tar.bz2
Merge "Split UTF functions from String8/16"
Diffstat (limited to 'libs/rs/rsFont.cpp')
-rw-r--r--libs/rs/rsFont.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/rsFont.cpp b/libs/rs/rsFont.cpp
index 33b0f51..96e350d 100644
--- a/libs/rs/rsFont.cpp
+++ b/libs/rs/rsFont.cpp
@@ -174,7 +174,7 @@ void Font::renderUTF(const char *text, uint32_t len, int32_t x, int32_t y,
while (glyphsLeft > 0) {
- int32_t utfChar = utf32_at(text, len, index, &nextIndex);
+ int32_t utfChar = utf32_from_utf8_at(text, len, index, &nextIndex);
// Reached the end of the string or encountered
if (utfChar < 0) {