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

Merge branch 'master' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
Dane Springmeyer 2014-06-19 16:28:35 -07:00
commit 29ed31f69d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/text/glyph_info.hpp
View file

@ -67,9 +67,7 @@ struct glyph_info
double ymin() const { return floor(unscaled_ymin * 64.0 * scale_multiplier); } double ymin() const { return floor(unscaled_ymin * 64.0 * scale_multiplier); }
double ymax() const { return ceil(unscaled_ymax * 64.0 * scale_multiplier); } double ymax() const { return ceil(unscaled_ymax * 64.0 * scale_multiplier); }
double height() const { return ymax() - ymin(); }; double height() const { return ymax() - ymin(); };
// TODO: we round to integers for now to maintain double advance() const { return unscaled_advance * scale_multiplier; };
// back compatibility with Mapnik 2.x
double advance() const { return floor(unscaled_advance * scale_multiplier); };
double line_height() const { return ceil(unscaled_line_height * scale_multiplier); }; double line_height() const { return ceil(unscaled_line_height * scale_multiplier); };
}; };