aboutsummaryrefslogtreecommitdiffstats
path: root/native/src
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-11-16 23:23:52 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-16 23:23:52 -0800
commit620b1faf126d4b5f7cb5c353cebd374d1347fdd4 (patch)
treeec5498766b06f85ea2885ea29dd31fea02c7bbd1 /native/src
parentd845c26b0e72e67aa14b5eac4616eb5ee7d81b33 (diff)
parent554fdd21a1ec0058cdf5e697f2be6dd29d7eb31b (diff)
downloadlatinime-620b1faf126d4b5f7cb5c353cebd374d1347fdd4.tar.gz
latinime-620b1faf126d4b5f7cb5c353cebd374d1347fdd4.tar.xz
latinime-620b1faf126d4b5f7cb5c353cebd374d1347fdd4.zip
Merge "Fix the touch calibration bug" into ics-mr1
Diffstat (limited to 'native/src')
-rw-r--r--native/src/correction.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/native/src/correction.cpp b/native/src/correction.cpp
index 0c566802c..27dc40745 100644
--- a/native/src/correction.cpp
+++ b/native/src/correction.cpp
@@ -758,6 +758,9 @@ int Correction::RankingAlgorithm::calculateFinalFreq(const int inputIndex, const
// \ .
// C \ .
// 0 R1 R2
+ if (factor <= 0) {
+ return -1;
+ }
multiplyRate((int)(factor * 100), &finalFreq);
} else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) {
multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);