nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3083b4b7: Merge "Fix a debug method" into jb-mr1-dev 

* commit '3083b4b77d51b28749a819d4e01a09ec558956e4':
  Fix a debug method
main
Jean Chalard 2012-08-16 18:00:28 -07:00 committed by Android Git Automerger
parent cd4c6c4d21 3083b4b77d
commit 0d2cece02d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -162,7 +162,7 @@ public class BinaryDictionary extends Dictionary {
if (composerSize > 0 && mOutputScores[j] < 1) break; if (composerSize > 0 && mOutputScores[j] < 1) break;
final int start = j * MAX_WORD_LENGTH; final int start = j * MAX_WORD_LENGTH;
int len = 0; int len = 0;
while (len < MAX_WORD_LENGTH && mOutputChars[start + len] != 0) { while (len < MAX_WORD_LENGTH && mOutputChars[start + len] != 0) {
++len; ++len;
} }
if (len > 0) { if (len > 0) {

4
native/jni/src/debug.h
View File

@ -22,7 +22,7 @@
static inline unsigned char *convertToUnibyteString(unsigned short *input, unsigned char *output, static inline unsigned char *convertToUnibyteString(unsigned short *input, unsigned char *output,
const unsigned int length) { const unsigned int length) {
unsigned int i = 0; unsigned int i = 0;
for (; i <= length && input[i] != 0; ++i) for (; i < length && input[i] != 0; ++i)
output[i] = input[i] & 0xFF; output[i] = input[i] & 0xFF;
output[i] = 0; output[i] = 0;
return output; return output;
@ -31,7 +31,7 @@ static inline unsigned char *convertToUnibyteString(unsigned short *input, unsig
static inline unsigned char *convertToUnibyteStringAndReplaceLastChar(unsigned short *input, static inline unsigned char *convertToUnibyteStringAndReplaceLastChar(unsigned short *input,
unsigned char *output, const unsigned int length, unsigned char c) { unsigned char *output, const unsigned int length, unsigned char c) {
unsigned int i = 0; unsigned int i = 0;
for (; i <= length && input[i] != 0; ++i) for (; i < length && input[i] != 0; ++i)
output[i] = input[i] & 0xFF; output[i] = input[i] & 0xFF;
if (i > 0) output[i-1] = c; if (i > 0) output[i-1] = c;
output[i] = 0; output[i] = 0;