aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-01-29 14:49:45 +0900
committerKen Wakasa <kwakasa@google.com>2013-01-29 14:49:45 +0900
commit19e13df91f36cf131f5139c44d7b80fc1e8f6f21 (patch)
tree3ce69a1ed0dff0acf039dd0ed572d2cccdd46d0f
parent56012e5ab952ecae965818d89b9ee51ef1f84ddb (diff)
downloadlatinime-19e13df91f36cf131f5139c44d7b80fc1e8f6f21.tar.gz
latinime-19e13df91f36cf131f5139c44d7b80fc1e8f6f21.tar.xz
latinime-19e13df91f36cf131f5139c44d7b80fc1e8f6f21.zip
Remove a duplicated method
Change-Id: I41bd0612bf42d549d1acf0d733b689fce68aa8a1
-rw-r--r--native/jni/src/bigram_dictionary.cpp3
-rw-r--r--native/jni/src/dictionary.h16
2 files changed, 2 insertions, 17 deletions
diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp
index 44dc75e9c..ef0434c49 100644
--- a/native/jni/src/bigram_dictionary.cpp
+++ b/native/jni/src/bigram_dictionary.cpp
@@ -21,6 +21,7 @@
#include "bigram_dictionary.h"
#include "binary_format.h"
#include "bloom_filter.h"
+#include "char_utils.h"
#include "defines.h"
#include "dictionary.h"
@@ -50,7 +51,7 @@ void BigramDictionary::addWordBigram(int *word, int length, int frequency, int *
int insertAt = 0;
while (insertAt < MAX_RESULTS) {
if (frequency > bigramFreq[insertAt] || (bigramFreq[insertAt] == frequency
- && length < Dictionary::wideStrLen(
+ && length < getCodePointCount(MAX_WORD_LENGTH,
bigramCodePoints + insertAt * MAX_WORD_LENGTH))) {
break;
}
diff --git a/native/jni/src/dictionary.h b/native/jni/src/dictionary.h
index 121cf058d..83676b204 100644
--- a/native/jni/src/dictionary.h
+++ b/native/jni/src/dictionary.h
@@ -65,10 +65,6 @@ class Dictionary {
int getDictBufAdjust() const { return mDictBufAdjust; }
virtual ~Dictionary();
- // public static utility methods
- // static inline methods should be defined in the header file
- static int wideStrLen(int *str);
-
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(Dictionary);
const uint8_t *mDict;
@@ -84,17 +80,5 @@ class Dictionary {
const BigramDictionary *mBigramDictionary;
SuggestInterface *mGestureSuggest;
};
-
-// public static utility methods
-// static inline methods should be defined in the header file
-inline int Dictionary::wideStrLen(int *str) {
- if (!str) return 0;
- int length = 0;
- while (*str) {
- str++;
- length++;
- }
- return length;
-}
} // namespace latinime
#endif // LATINIME_DICTIONARY_H