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

am cffb3126: Small cleanups 

# Via Ken Wakasa
* commit 'cffb3126acc5c4cb1fc1742ecd0cdf9d6a18f8a3':
  Small cleanups
main
Ken Wakasa 2013-01-29 19:24:54 -08:00 committed by Android Git Automerger
parent c29309e051 cffb3126ac
commit e0a345a265
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
View File

@ -87,7 +87,7 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s
AKLOGE("DICT: Can't allocate memory region for dictionary. errno=%d", errno); AKLOGE("DICT: Can't allocate memory region for dictionary. errno=%d", errno);
return 0; return 0;
} }
int ret = fseek(file, (long)dictOffset, SEEK_SET); int ret = fseek(file, static_cast<long>(dictOffset), SEEK_SET);
if (ret != 0) { if (ret != 0) {
AKLOGE("DICT: Failure in fseek. ret=%d errno=%d", ret, errno); AKLOGE("DICT: Failure in fseek. ret=%d errno=%d", ret, errno);
return 0; return 0;
@ -121,7 +121,7 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s
} }
PROF_END(66); PROF_END(66);
PROF_CLOSE; PROF_CLOSE;
return (jlong)dictionary; return reinterpret_cast<jlong>(dictionary);
} }
static int latinime_BinaryDictionary_getSuggestions(JNIEnv *env, jclass clazz, jlong dict, static int latinime_BinaryDictionary_getSuggestions(JNIEnv *env, jclass clazz, jlong dict,
@ -216,7 +216,7 @@ static jint latinime_BinaryDictionary_getFrequency(JNIEnv *env, jclass clazz, jl
static jboolean latinime_BinaryDictionary_isValidBigram(JNIEnv *env, jclass clazz, jlong dict, static jboolean latinime_BinaryDictionary_isValidBigram(JNIEnv *env, jclass clazz, jlong dict,
jintArray wordArray1, jintArray wordArray2) { jintArray wordArray1, jintArray wordArray2) {
Dictionary *dictionary = reinterpret_cast<Dictionary *>(dict); Dictionary *dictionary = reinterpret_cast<Dictionary *>(dict);
if (!dictionary) return (jboolean) false; if (!dictionary) return JNI_FALSE;
const jsize codePointLength1 = env->GetArrayLength(wordArray1); const jsize codePointLength1 = env->GetArrayLength(wordArray1);
const jsize codePointLength2 = env->GetArrayLength(wordArray2); const jsize codePointLength2 = env->GetArrayLength(wordArray2);
int codePoints1[codePointLength1]; int codePoints1[codePointLength1];

2
native/jni/src/binary_format.h
View File

@ -314,7 +314,7 @@ static inline int childrenAddressSize(const uint8_t flags) {
} }
static AK_FORCE_INLINE int shortcutByteSize(const uint8_t *const dict, const int pos) { static AK_FORCE_INLINE int shortcutByteSize(const uint8_t *const dict, const int pos) {
return ((int)(dict[pos] << 8)) + (dict[pos + 1]); return (static_cast<int>(dict[pos] << 8)) + (dict[pos + 1]);
} }
inline int BinaryFormat::skipChildrenPosition(const uint8_t flags, const int pos) { inline int BinaryFormat::skipChildrenPosition(const uint8_t flags, const int pos) {

2
native/jni/src/correction.cpp
View File

@ -677,7 +677,7 @@ inline static bool isUpperCase(unsigned short c) {
const float factor = const float factor =
SuggestUtils::getDistanceScalingFactor(static_cast<float>(squaredDistance)); SuggestUtils::getDistanceScalingFactor(static_cast<float>(squaredDistance));
if (factor > 0.0f) { if (factor > 0.0f) {
multiplyRate((int)(factor * 100.0f), &finalFreq); multiplyRate(static_cast<int>(factor * 100.0f), &finalFreq);
} else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) { } else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) {
multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq); multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);
} }

2
native/jni/src/proximity_info_state_utils.cpp
View File

@ -211,7 +211,7 @@ namespace latinime {
ProximityInfoParams::NOT_A_DISTANCE_FLOAT; ProximityInfoParams::NOT_A_DISTANCE_FLOAT;
if (squaredDistance >= 0.0f) { if (squaredDistance >= 0.0f) {
normalizedSquaredDistances[i * MAX_PROXIMITY_CHARS_SIZE + j] = normalizedSquaredDistances[i * MAX_PROXIMITY_CHARS_SIZE + j] =
(int) (squaredDistance static_cast<int>(squaredDistance
* ProximityInfoParams::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR); * ProximityInfoParams::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR);
} else { } else {
normalizedSquaredDistances[i * MAX_PROXIMITY_CHARS_SIZE + j] = normalizedSquaredDistances[i * MAX_PROXIMITY_CHARS_SIZE + j] =