Merge "Fix a bug with negative coordinates, step 2"

main
Jean Chalard 2012-03-23 03:50:05 -07:00 committed by Android (Google) Code Review
commit e2222b78d3
1 changed files with 5 additions and 5 deletions

View File

@ -180,11 +180,11 @@ void ProximityInfo::calculateNearbyKeyCodes(
if (additionalProximitySize > 0) { if (additionalProximitySize > 0) {
inputCodes[insertPos++] = ADDITIONAL_PROXIMITY_CHAR_DELIMITER_CODE; inputCodes[insertPos++] = ADDITIONAL_PROXIMITY_CHAR_DELIMITER_CODE;
if (insertPos >= MAX_PROXIMITY_CHARS_SIZE) { if (insertPos >= MAX_PROXIMITY_CHARS_SIZE) {
if (DEBUG_DICT) { if (DEBUG_DICT) {
assert(false); assert(false);
}
return;
} }
return;
}
const int32_t* additionalProximityChars = const int32_t* additionalProximityChars =
AdditionalProximityChars::getAdditionalChars(&mLocaleStr, primaryKey); AdditionalProximityChars::getAdditionalChars(&mLocaleStr, primaryKey);
@ -205,9 +205,9 @@ void ProximityInfo::calculateNearbyKeyCodes(
assert(false); assert(false);
} }
return; return;
}
} }
} }
}
// Add a delimiter for the proximity characters // Add a delimiter for the proximity characters
for (int i = insertPos; i < MAX_PROXIMITY_CHARS_SIZE; ++i) { for (int i = insertPos; i < MAX_PROXIMITY_CHARS_SIZE; ++i) {