@@ -302,7 +302,7 @@ static std::vector<SCRIPT_ITEM> Uniscrib
for (auto const &i : fontMapping) {
while (cur_pos < i.first && cur_item != items.end() - 1) {
/* Add a range that spans the intersection of the remaining item and font run. */
int stop_pos = min(i.first, (cur_item + 1)->iCharPos);
int stop_pos = std::min(i.first, (cur_item + 1)->iCharPos);
assert(stop_pos - cur_pos > 0);
ranges.push_back(UniscribeRun(cur_pos, stop_pos - cur_pos, i.second, cur_item->a));
@@ -452,7 +452,7 @@ int UniscribeParagraphLayout::UniscribeL
{
int leading = 0;
for (const auto &run : *this) {
leading = max(leading, run.GetLeading());
leading = std::max(leading, run.GetLeading());
}
return leading;