am ff27bcad: Merge "Fix: ProbabilityDictContent can be wrongly large."

* commit 'ff27bcad74c5327f02563b33ddc62101f0b9c697':
  Fix: ProbabilityDictContent can be wrongly large.
main
Keisuke Kuroyanagi 2014-10-06 04:02:42 +00:00 committed by Android Git Automerger
commit b845313b60
1 changed files with 1 additions and 3 deletions

View File

@ -74,8 +74,8 @@ bool ProbabilityDictContent::setProbabilityEntry(const int terminalId,
return false; return false;
} }
writingPos += getEntrySize(); writingPos += getEntrySize();
mSize++;
} }
mSize = terminalId + 1;
} }
return writeEntry(probabilityEntry, entryPos); return writeEntry(probabilityEntry, entryPos);
} }
@ -100,7 +100,6 @@ bool ProbabilityDictContent::flushToFile(const char *const dictPath) const {
bool ProbabilityDictContent::runGC( bool ProbabilityDictContent::runGC(
const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap, const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,
const ProbabilityDictContent *const originalProbabilityDictContent) { const ProbabilityDictContent *const originalProbabilityDictContent) {
mSize = 0;
for (TerminalPositionLookupTable::TerminalIdMap::const_iterator it = terminalIdMap->begin(); for (TerminalPositionLookupTable::TerminalIdMap::const_iterator it = terminalIdMap->begin();
it != terminalIdMap->end(); ++it) { it != terminalIdMap->end(); ++it) {
const ProbabilityEntry probabilityEntry = const ProbabilityEntry probabilityEntry =
@ -109,7 +108,6 @@ bool ProbabilityDictContent::runGC(
AKLOGE("Cannot set probability entry in runGC. terminalId: %d", it->second); AKLOGE("Cannot set probability entry in runGC. terminalId: %d", it->second);
return false; return false;
} }
mSize++;
} }
return true; return true;
} }