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

remove std::function from placement loop

Browse source 
(std::function incurs overhead of polymorphic dispatch internally and relatively expensive - avoid using in performance critic code)
This commit is contained in:
artemp 2014-10-01 11:22:29 +01:00
parent 1d5f1f12f0
commit 745d45bb68
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/text/placement_finder.cpp
View file

@ -36,7 +36,6 @@
// stl // stl
#include <vector> #include <vector>
#include <functional>
namespace mapnik namespace mapnik
{ {
@ -211,17 +210,22 @@ bool placement_finder::single_line_placement(vertex_cache &pp, text_upright_e or
double angle; double angle;
rotation rot; rotation rot;
double last_glyph_spacing = 0.; double last_glyph_spacing = 0.;
std::function<bool(double)> glyph_move_method = std::bind(
move_by_length ? &vertex_cache::move : &vertex_cache::move_to_distance, &off_pp, std::placeholders::_1);
for (auto const& glyph : line) for (auto const& glyph : line)
{ {
if (current_cluster != static_cast<int>(glyph.char_index)) if (current_cluster != static_cast<int>(glyph.char_index))
{ {
if (!glyph_move_method(sign * (layout.cluster_width(current_cluster) + last_glyph_spacing))) if (move_by_length)
{ {
return false; if (!off_pp.move(sign * (layout.cluster_width(current_cluster) + last_glyph_spacing)))
return false;
} }
else
{
if (!off_pp.move_to_distance(sign * (layout.cluster_width(current_cluster) + last_glyph_spacing)))
return false;
}
current_cluster = glyph.char_index; current_cluster = glyph.char_index;
last_glyph_spacing = glyph.format->character_spacing * scale_factor_; last_glyph_spacing = glyph.format->character_spacing * scale_factor_;
// Only calculate new angle at the start of each cluster! // Only calculate new angle at the start of each cluster!