diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-09-03 22:26:42 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-09-03 22:26:42 -0700 |
| commit | d34dd5bb6bb01666171a37e9cefe46bb20d04e93 (patch) | |
| tree | 622095ad7f31220916d09deee472c1a6246a7970 /native/jni/src/terminal_attributes.h | |
| parent | 2c0c1cc677b947521384c5b9bc2b7b0469929581 (diff) | |
| parent | f2789819bd005b5b0581e8439601b5501306327d (diff) | |
| download | latinime-d34dd5bb6bb01666171a37e9cefe46bb20d04e93.tar.gz latinime-d34dd5bb6bb01666171a37e9cefe46bb20d04e93.tar.xz latinime-d34dd5bb6bb01666171a37e9cefe46bb20d04e93.zip | |
Merge "Cosmetic fixes and a bug fix in UnigramDictionary::testCharGroupForContinuedLikeness()." into jb-mr1-dev
Diffstat (limited to 'native/jni/src/terminal_attributes.h')
| -rw-r--r-- | native/jni/src/terminal_attributes.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/native/jni/src/terminal_attributes.h b/native/jni/src/terminal_attributes.h index 9ff2772b1..53ae385ea 100644 --- a/native/jni/src/terminal_attributes.h +++ b/native/jni/src/terminal_attributes.h @@ -52,9 +52,9 @@ class TerminalAttributes { 0 != (shortcutFlags & BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT); unsigned int i; for (i = 0; i < MAX_WORD_LENGTH_INTERNAL; ++i) { - const int charCode = BinaryFormat::getCharCodeAndForwardPointer(mDict, &mPos); - if (NOT_A_CHARACTER == charCode) break; - outWord[i] = (uint16_t)charCode; + const int codePoint = BinaryFormat::getCodePointAndForwardPointer(mDict, &mPos); + if (NOT_A_CODE_POINT == codePoint) break; + outWord[i] = (uint16_t)codePoint; } *outFreq = BinaryFormat::getAttributeFrequencyFromFlags(shortcutFlags); mPos += BinaryFormat::CHARACTER_ARRAY_TERMINATOR_SIZE; @@ -62,8 +62,8 @@ class TerminalAttributes { } }; - TerminalAttributes(const uint8_t *const dict, const uint8_t flags, const int pos) : - mDict(dict), mFlags(flags), mStartPos(pos) { + TerminalAttributes(const uint8_t *const dict, const uint8_t flags, const int pos) + : mDict(dict), mFlags(flags), mStartPos(pos) { } inline ShortcutIterator getShortcutIterator() const { |