diff options
author | 2013-01-14 19:46:09 -0800 | |
---|---|---|
committer | 2013-01-14 19:46:09 -0800 | |
commit | c995dbcf598730f138e59f989e813b83d585d40b (patch) | |
tree | aec8a6f6d255c0fbb547d88448105c025a5e23bc /native/jni/src/terminal_attributes.h | |
parent | 722eeb144f4a0af337784ffa311217432272e19d (diff) | |
parent | 5db594abbad2d9e8d2cf1aa6e417aa50ffc5dfc1 (diff) | |
download | latinime-c995dbcf598730f138e59f989e813b83d585d40b.tar.gz latinime-c995dbcf598730f138e59f989e813b83d585d40b.tar.xz latinime-c995dbcf598730f138e59f989e813b83d585d40b.zip |
Merge "Remove MAX_WORD_LENGTH_INTERNAL"
Diffstat (limited to 'native/jni/src/terminal_attributes.h')
-rw-r--r-- | native/jni/src/terminal_attributes.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/native/jni/src/terminal_attributes.h b/native/jni/src/terminal_attributes.h index 6c2e0dce1..a8cc03b8d 100644 --- a/native/jni/src/terminal_attributes.h +++ b/native/jni/src/terminal_attributes.h @@ -30,10 +30,6 @@ namespace latinime { class TerminalAttributes { public: class ShortcutIterator { - const uint8_t *const mDict; - int mPos; - bool mHasNextShortcutTarget; - public: ShortcutIterator(const uint8_t *dict, const int pos, const uint8_t flags) : mDict(dict), mPos(pos), @@ -50,7 +46,7 @@ class TerminalAttributes { const int shortcutFlags = BinaryFormat::getFlagsAndForwardPointer(mDict, &mPos); mHasNextShortcutTarget = 0 != (shortcutFlags & BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT); unsigned int i; - for (i = 0; i < MAX_WORD_LENGTH_INTERNAL; ++i) { + for (i = 0; i < MAX_WORD_LENGTH; ++i) { const int codePoint = BinaryFormat::getCodePointAndForwardPointer(mDict, &mPos); if (NOT_A_CODE_POINT == codePoint) break; outWord[i] = codePoint; @@ -58,6 +54,11 @@ class TerminalAttributes { *outFreq = BinaryFormat::getAttributeFrequencyFromFlags(shortcutFlags); return i; } + + private: + const uint8_t *const mDict; + int mPos; + bool mHasNextShortcutTarget; }; TerminalAttributes(const uint8_t *const dict, const uint8_t flags, const int pos) |