diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-09-04 06:36:20 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-09-04 06:36:21 -0700 |
| commit | 58bb1d7dd1f1114c27ec921ff738fa9f8490c2d7 (patch) | |
| tree | d18dd6573a855558f4b6d9ff8d321d7e86382a75 | |
| parent | ac25fcac717b0d28dfb2cd5c8ecd4fde839c4eeb (diff) | |
| parent | d86d313b312f6496018629ed197371845682deb2 (diff) | |
| download | latinime-58bb1d7dd1f1114c27ec921ff738fa9f8490c2d7.tar.gz latinime-58bb1d7dd1f1114c27ec921ff738fa9f8490c2d7.tar.xz latinime-58bb1d7dd1f1114c27ec921ff738fa9f8490c2d7.zip | |
Merge "Fix variable type" into jb-mr1-dev
| -rw-r--r-- | native/jni/src/bigram_dictionary.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp index 3eea51a41..dade4f16b 100644 --- a/native/jni/src/bigram_dictionary.cpp +++ b/native/jni/src/bigram_dictionary.cpp @@ -113,7 +113,7 @@ int BigramDictionary::getBigrams(const int32_t *prevWord, int prevWordLength, in } // If still no bigrams, we really don't have them! if (0 == pos) return 0; - int bigramFlags; + uint8_t bigramFlags; int bigramCount = 0; do { bigramFlags = BinaryFormat::getFlagsAndForwardPointer(root, &pos); @@ -153,7 +153,7 @@ int BigramDictionary::getBigramListPositionForWord(const int32_t *prevWord, forceLowerCaseSearch); if (NOT_VALID_WORD == pos) return 0; - const int flags = BinaryFormat::getFlagsAndForwardPointer(root, &pos); + const uint8_t flags = BinaryFormat::getFlagsAndForwardPointer(root, &pos); if (0 == (flags & BinaryFormat::FLAG_HAS_BIGRAMS)) return 0; if (0 == (flags & BinaryFormat::FLAG_HAS_MULTIPLE_CHARS)) { BinaryFormat::getCodePointAndForwardPointer(root, &pos); @@ -179,7 +179,7 @@ void BigramDictionary::fillBigramAddressToFrequencyMapAndFilter(const int32_t *p } if (0 == pos) return; - int bigramFlags; + uint8_t bigramFlags; do { bigramFlags = BinaryFormat::getFlagsAndForwardPointer(root, &pos); const int frequency = BinaryFormat::MASK_ATTRIBUTE_FREQUENCY & bigramFlags; @@ -215,7 +215,7 @@ bool BigramDictionary::isValidBigram(const int32_t *word1, int length1, const in int nextWordPos = BinaryFormat::getTerminalPosition(root, word2, length2, false /* forceLowerCaseSearch */); if (NOT_VALID_WORD == nextWordPos) return false; - int bigramFlags; + uint8_t bigramFlags; do { bigramFlags = BinaryFormat::getFlagsAndForwardPointer(root, &pos); const int bigramPos = BinaryFormat::getAttributeAddressAndForwardPointer(root, bigramFlags, |