mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-23 12:14:11 +01:00
Code Issues Releases Wiki Activity

Codechange: Use structured bindings when iterating font_mapping.

Browse Source
This commit is contained in:
Peter Nelson
2024-12-20 17:46:14 +00:00
committed by Peter Nelson
parent c78e309b16
commit 59680867c3
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gfx_layout_icu.cpp
View File

@@ -338,12 +338,12 @@ std::vector<ICURun> ItemizeStyle(std::vector<ICURun> &runs_current, FontMap &fon
int cur_pos = 0;
auto cur_run = runs_current.begin();
for (auto const &font_map : font_mapping) {
while (cur_pos < font_map.first && cur_run != runs_current.end()) {
int stop_pos = std::min(font_map.first, cur_run->start + cur_run->length);
for (auto const &[position, font] : font_mapping) {
while (cur_pos < position && cur_run != runs_current.end()) {
int stop_pos = std::min(position, cur_run->start + cur_run->length);
assert(stop_pos - cur_pos > 0);
runs.emplace_back(cur_pos, stop_pos - cur_pos, cur_run->level, cur_run->script, font_map.second);
runs.emplace_back(cur_pos, stop_pos - cur_pos, cur_run->level, cur_run->script, font);
if (stop_pos == cur_run->start + cur_run->length) cur_run++;
cur_pos = stop_pos;
@@ -360,8 +360,8 @@ std::vector<ICURun> ItemizeStyle(std::vector<ICURun> &runs_current, FontMap &fon
if (length == 0) return nullptr;
/* Can't layout our in-built sprite fonts. */
for (auto const &pair : font_mapping) {
if (pair.second->fc->IsBuiltInFont()) return nullptr;
for (auto const &[position, font] : font_mapping) {
if (font->fc->IsBuiltInFont()) return nullptr;
}
auto runs = ItemizeBidi(buff, length);