chris/open-roms
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed small bug preventing proper dictionary encoding

Browse Source
This commit is contained in:
FeralChild64 committed 2020-06-23 21:20:42 +02:00
1 parent 4e669bd908
commit 3cd3f58954
1 file changed
+13 -11
Download Patch File Download Diff File Expand all files Collapse all files
tools/generate_strings.cc
+13 -11
View File
@@ -1015,7 +1015,7 @@ void DataSet::encodeStringsDict()
for (uint8_t idx = 0; idx < stringEntryLists.size(); idx++) for (uint8_t idx = 0; idx < stringEntryLists.size(); idx++)
{ {
const auto &stringEntryList = stringEntryLists[idx]; const auto &stringEntryList = stringEntryLists[idx];
auto &stringEncodedList = stringEncodedLists[idx]; auto &stringEncodedList = stringEncodedLists[idx];
// Skip lists not to be encoded using the dictionary // Skip lists not to be encoded using the dictionary
if (!isCompressionLvl2(stringEntryList)) continue; if (!isCompressionLvl2(stringEntryList)) continue;
@@ -1030,10 +1030,13 @@ void DataSet::encodeStringsDict()
// Perform the compression // Perform the compression
stringEntryLists.emplace_back(); StringEntryList dictionary;
stringEncodedLists.emplace_back(); dictEncoder.process(dictionary);
dictEncoder.process(stringEntryLists.back()); // Add new lists
stringEntryLists.push_back(dictionary);
stringEncodedLists.emplace_back();
} }
void DataSet::calculateFrequencies() void DataSet::calculateFrequencies()
@@ -1184,8 +1187,6 @@ void DataSet::encodeByFreq(const std::string &plain, StringEncoded &encoded) con
void DataSet::encodeStringsFreq() void DataSet::encodeStringsFreq()
{ {
stringEncodedLists.clear();
// Encode every relevant string from every list - by character frequency // Encode every relevant string from every list - by character frequency
for (uint8_t idx = 0; idx < stringEntryLists.size(); idx++) for (uint8_t idx = 0; idx < stringEntryLists.size(); idx++)
@@ -1279,15 +1280,16 @@ void DataSet::prepareOutput_labels(std::ostringstream &stream,
if (stringEntryList.type == ListType::DICTIONARY) return; if (stringEntryList.type == ListType::DICTIONARY) return;
stream << std::endl; stream << std::endl;
for (uint8_t idxString = 0; idxString < stringEncodedList.size(); idxString++) for (uint8_t idx = 0; idx < stringEncodedList.size(); idx++)
{ {
const auto &stringEntry = stringEntryList.list[idxString]; const auto &stringEntry = stringEntryList.list[idx];
const auto &stringEncoded = stringEncodedList[idxString]; const auto &stringEncoded = stringEncodedList[idx];
if (!stringEncoded.empty()) if (!stringEncoded.empty())
{ {
stream << ".label IDX__" << stringEntry.alias << std::string(maxAliasLen - stringEntry.alias.length(), ' ') << stream << ".label IDX__" << stringEntry.alias <<
" = $" << std::uppercase << std::hex << std::setfill('0') << std::setw(2) << +idxString << std::endl; std::string(maxAliasLen - stringEntry.alias.length(), ' ') << " = $" <<
std::uppercase << std::hex << std::setfill('0') << std::setw(2) << +idx << std::endl;
} }
} }
} }