sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify logic

Browse source
This commit is contained in:
artemp 2017-02-17 15:23:00 +01:00
parent 49c28cb6ad
commit fe7d1e2f53
1 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
include/mapnik/text/harfbuzz_shaper.hpp
View file

@ -149,38 +149,22 @@ static void shape_text(text_line & line,
}
// if we have a valid codepoint, save rendering info.
if (glyphs[i].codepoint)
{
auto itr = glyphinfos.find(cluster);
if (itr == glyphinfos.end())
{
std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
bool result = false;
std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
}
if (itr->second.front().glyph.codepoint == 0)
{
itr->second.front() = { face, glyphs[i], positions[i] };
}
else if (in_cluster)
{
itr->second.push_back({ face, glyphs[i], positions[i] });
}
}
else
auto itr = glyphinfos.find(cluster);
if (itr == glyphinfos.end())
{
auto itr = glyphinfos.find(cluster);
if (itr == glyphinfos.end())
{
std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
bool result = false;
std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
}
if (itr != glyphinfos.end() && itr->second.front().glyph.codepoint == 0)
{
itr->second.front() = { face, glyphs[i], positions[i] };
}
std::vector<glyph_face_info> v = {{ face, glyphs[i], positions[i] }};
bool result = false;
std::tie(itr, result) = glyphinfos.insert(std::make_pair(cluster, v));
}
if (itr->second.front().glyph.codepoint == 0)
{
itr->second.front() = { face, glyphs[i], positions[i] };
}
else if (in_cluster)
{
itr->second.push_back({ face, glyphs[i], positions[i] });
}
}