archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop-master

Browse Source
This commit is contained in:
artemp 2016-11-28 15:26:13 +01:00
commit 0ea1c7cce2
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mapnik/text/placement_finder.hpp
View File

@ -67,8 +67,6 @@ private:
bool single_line_placement(vertex_cache &pp, text_upright_e orientation);
// Moves dx pixels but makes sure not to fall of the end.
void path_move_dx(vertex_cache & pp, double dx);
// Normalize angle in range [-pi, +pi].
static double normalize_angle(double angle);
// Adjusts user defined spacing to place an integer number of labels.
double get_spacing(double path_length, double layout_width) const;
// Checks for collision.