aboutsummaryrefslogtreecommitdiffstats
path: root/native/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2011-06-01 23:56:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-01 23:56:34 -0700
commit42bbcd69c0dee4cd1d29c038680ebd1f52be9ed1 (patch)
tree02eb8c7356e0030d5c6ea206da322a0ae3791429 /native/src
parentb400f821847426a2f8e1c0b3e613bd6f47ae2e54 (diff)
parente93b1f2209e26add7e5c2685990a8ce921fd6e32 (diff)
downloadlatinime-42bbcd69c0dee4cd1d29c038680ebd1f52be9ed1.tar.gz
latinime-42bbcd69c0dee4cd1d29c038680ebd1f52be9ed1.tar.xz
latinime-42bbcd69c0dee4cd1d29c038680ebd1f52be9ed1.zip
Merge "Allow reading a binary dictionary even without proximity info."
Diffstat (limited to 'native/src')
-rw-r--r--native/src/dictionary.cpp2
-rw-r--r--native/src/unigram_dictionary.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/native/src/dictionary.cpp b/native/src/dictionary.cpp
index d69cb2a53..d9ef8f3b7 100644
--- a/native/src/dictionary.cpp
+++ b/native/src/dictionary.cpp
@@ -53,7 +53,7 @@ bool Dictionary::hasBigram() {
return ((mDict[1] & 0xFF) == 1);
}
-// TODO: use uint16_t instead of unsigned short
+// TODO: use uint32_t instead of unsigned short
bool Dictionary::isValidWord(unsigned short *word, int length) {
if (IS_LATEST_DICT_VERSION) {
return (isValidWordRec(DICTIONARY_HEADER_SIZE, word, 0, length) != NOT_VALID_WORD);
diff --git a/native/src/unigram_dictionary.cpp b/native/src/unigram_dictionary.cpp
index 0930b8e4c..e49e95b81 100644
--- a/native/src/unigram_dictionary.cpp
+++ b/native/src/unigram_dictionary.cpp
@@ -233,7 +233,7 @@ void UnigramDictionary::getWordSuggestions(const ProximityInfo *proximityInfo,
PROF_END(5);
PROF_START(6);
- if (SUGGEST_WORDS_WITH_SPACE_PROXIMITY) {
+ if (SUGGEST_WORDS_WITH_SPACE_PROXIMITY && proximityInfo) {
// The first and last "mistyped spaces" are taken care of by excessive character handling
for (int i = 1; i < codesSize - 1; ++i) {
if (DEBUG_DICT) {