diff options
| author |   Tom Ouyang <ouyang@google.com> | 2013-04-09 13:42:06 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-09 13:42:06 -0700 |
| commit | ff981cc3e3169ca0b9af9bf40cd55cd9f95fa63e (patch) | |
| tree | d1ad8380e63e631d17bc52f664b6748354a3a993 /native/jni/src/unigram_dictionary.cpp | |
| parent | 8e7ca6be7ee0b4bbad536b8434b4e5826b8c9ecf (diff) | |
| parent | 43779c04a9933bd1bcba3655b314485cc08bf2c2 (diff) | |
| download | latinime-ff981cc3e3169ca0b9af9bf40cd55cd9f95fa63e.tar.gz latinime-ff981cc3e3169ca0b9af9bf40cd55cd9f95fa63e.tar.xz latinime-ff981cc3e3169ca0b9af9bf40cd55cd9f95fa63e.zip | |
am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
* commit '43779c04a9933bd1bcba3655b314485cc08bf2c2':
Add method to get dictionary flags from DicTraverseSession
Diffstat (limited to 'native/jni/src/unigram_dictionary.cpp')
| -rw-r--r-- | native/jni/src/unigram_dictionary.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/src/unigram_dictionary.cpp b/native/jni/src/unigram_dictionary.cpp index 33795cade..a672294b5 100644 --- a/native/jni/src/unigram_dictionary.cpp +++ b/native/jni/src/unigram_dictionary.cpp @@ -32,9 +32,9 @@ namespace latinime { // TODO: check the header -UnigramDictionary::UnigramDictionary(const uint8_t *const streamStart, const unsigned int flags) +UnigramDictionary::UnigramDictionary(const uint8_t *const streamStart, const unsigned int dictFlags) : DICT_ROOT(streamStart), ROOT_POS(0), - MAX_DIGRAPH_SEARCH_DEPTH(DEFAULT_MAX_DIGRAPH_SEARCH_DEPTH), FLAGS(flags) { + MAX_DIGRAPH_SEARCH_DEPTH(DEFAULT_MAX_DIGRAPH_SEARCH_DEPTH), DICT_FLAGS(dictFlags) { if (DEBUG_DICT) { AKLOGI("UnigramDictionary - constructor"); } @@ -163,7 +163,7 @@ int UnigramDictionary::getSuggestions(ProximityInfo *proximityInfo, const int *x masterCorrection.resetCorrection(); const DigraphUtils::digraph_t *digraphs = 0; const int digraphsSize = - DigraphUtils::getAllDigraphsForDictionaryAndReturnSize(FLAGS, &digraphs); + DigraphUtils::getAllDigraphsForDictionaryAndReturnSize(DICT_FLAGS, &digraphs); if (digraphsSize > 0) { // Incrementally tune the word and try all possibilities int codesBuffer[sizeof(*inputCodePoints) * inputSize]; |