diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-08-12 19:07:44 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-12 19:07:44 -0700 |
| commit | 7b4531a16f0d7f237822e94f3e962257ee9d0c16 (patch) | |
| tree | 2237aa0f754e3ab44ccfac034f5ef6e17ffda724 /native/jni/src/bigram_dictionary.cpp | |
| parent | f9b2841fb592778ad34b5181e1c0bcbf551e3632 (diff) | |
| parent | bcec82de66f52655593dc233346f11468f5077a0 (diff) | |
| download | latinime-7b4531a16f0d7f237822e94f3e962257ee9d0c16.tar.gz latinime-7b4531a16f0d7f237822e94f3e962257ee9d0c16.tar.xz latinime-7b4531a16f0d7f237822e94f3e962257ee9d0c16.zip | |
am bcec82de: Clean up constructors
* commit 'bcec82de66f52655593dc233346f11468f5077a0':
Clean up constructors
Diffstat (limited to 'native/jni/src/bigram_dictionary.cpp')
| -rw-r--r-- | native/jni/src/bigram_dictionary.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp index 220171127..df1ebc0e3 100644 --- a/native/jni/src/bigram_dictionary.cpp +++ b/native/jni/src/bigram_dictionary.cpp @@ -60,14 +60,15 @@ bool BigramDictionary::addWordBigram(unsigned short *word, int length, int frequ AKLOGI("Bigram: InsertAt -> %d MAX_PREDICTIONS: %d", insertAt, MAX_PREDICTIONS); } if (insertAt < MAX_PREDICTIONS) { - memmove((char*) bigramFreq + (insertAt + 1) * sizeof(bigramFreq[0]), - (char*) bigramFreq + insertAt * sizeof(bigramFreq[0]), - (MAX_PREDICTIONS - insertAt - 1) * sizeof(bigramFreq[0])); + memmove(reinterpret_cast<char *>(bigramFreq) + (insertAt + 1) * sizeof(bigramFreq[0]), + reinterpret_cast<char *>(bigramFreq) + insertAt * sizeof(bigramFreq[0]), + (MAX_PREDICTIONS - insertAt - 1) * sizeof(bigramFreq[0])); bigramFreq[insertAt] = frequency; outputTypes[insertAt] = Dictionary::KIND_PREDICTION; - memmove((char*) bigramChars + (insertAt + 1) * MAX_WORD_LENGTH * sizeof(short), - (char*) bigramChars + (insertAt ) * MAX_WORD_LENGTH * sizeof(short), - (MAX_PREDICTIONS - insertAt - 1) * sizeof(short) * MAX_WORD_LENGTH); + memmove(reinterpret_cast<char *>(bigramChars) + + (insertAt + 1) * MAX_WORD_LENGTH * sizeof(short), + reinterpret_cast<char *>(bigramChars) + insertAt * MAX_WORD_LENGTH * sizeof(short), + (MAX_PREDICTIONS - insertAt - 1) * sizeof(short) * MAX_WORD_LENGTH); unsigned short *dest = bigramChars + (insertAt ) * MAX_WORD_LENGTH; while (length--) { *dest++ = *word++; |